Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

2023-06-20 21:05:20 +08:00
parent e738d4e2e7 2784a6b6b8
commit 4c3ca1193a
6 changed files with 68 additions and 9 deletions
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java
@@ -31,11 +31,11 @@ public class PartnerUserInfoVO {
    @ApiModelProperty("常驻区域")
    private String liveArea;

-    @ApiModelProperty("意向开店区域")
+    @ApiModelProperty("意向开店区域ID")
    private String wantShopArea;

-    @ApiModelProperty("意向开店区域ID")
-    private Long wantShopAreaId;
+    @ApiModelProperty("意向开店区域名称")
+    private String wantShopAreaName;

    @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
    private Integer acceptAdjustType;