Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner

coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java

@@ -13,6 +13,9 @@ public class PartnerLineInfoAndBaseInfoDTO {
     @ApiModelProperty("线索ID")
     private Long id;
 
+    @ApiModelProperty("加盟申请基本信息 添加tags使用该ID")
+    private Long  partnerBaseInfoId;
+
     @ApiModelProperty("hy_partner_user_info.partner_id")
     private String partnerId;
 

coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java

@@ -15,8 +15,8 @@ import java.util.List;
 @ApiModel
 public class AddTagsRequest {
 
-    @ApiModelProperty("线索ID")
-    private Long  lineId;
+    @ApiModelProperty("加盟申请基本信息ID")
+    private Long  partnerBaseInfoId;
     @ApiModelProperty("标签列表")
     private List<String> Tags;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java

@@ -13,8 +13,8 @@ import lombok.Data;
 @ApiModel
 public class BaseUserInfoRequest {
 
-    @ApiModelProperty("ID")
-    private Long id;
+    @ApiModelProperty("partnerId")
+    private String partnerId;
 
     @ApiModelProperty("手机号")
     private String mobile;
@@ -25,11 +25,11 @@ public class BaseUserInfoRequest {
     @ApiModelProperty("常驻区域")
     private String liveArea;
 
-    @ApiModelProperty("意向开店区域")
+    @ApiModelProperty("意向开店区域ID")
     private String wantShopArea;
 
-    @ApiModelProperty("意向开店区域ID")
-    private Long wantShopAreaId;
+    @ApiModelProperty("意向开店区域Name")
+    private Long wantShopAreaName;
 
     @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
     private Integer acceptAdjustType;

coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author suzhuhong
  * @Date 2023/5/31 11:01
@@ -21,7 +23,7 @@ public class CloseFollowRequest {
     @ApiModelProperty("真实拒绝原因")
     private String rejectRealReason;
     @ApiModelProperty("证明文件与凭证")
-    private String certifyFile;
+    private List<String> certifyFile;
     @ApiModelProperty("通过原因")
     private String passReason;
     @ApiModelProperty("通过-pass   拒绝-reject")

coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java

@@ -18,6 +18,8 @@ public class PartnerLineInfoAndBaseInfoVO {
     @ApiModelProperty("线索ID")
     private Long id;
 
+    private Long partnerBaseInfoId;
+
     @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
     private String workflowStage;