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

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

@@ -0,0 +1,57 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author suzhuhong
+ * @Date 2023/5/30 15:14
+ * @Version 1.0
+ */
+@Data
+@ApiModel
+public class IndustryCognitionInfoRequest {
+
+    @ApiModelProperty("线索表ID")
+    private Long partnerLineId;
+
+    @ApiModelProperty("加盟商C端用户表ID   partnerId ")
+    private String partnerId;
+
+    @ApiModelProperty("学历")
+    private String education;
+
+    @ApiModelProperty("工作年限")
+    private String workYear;
+
+    @ApiModelProperty("是否具有工作经验")
+    private Integer isHaveWorkExp;
+
+    @ApiModelProperty("工作或经商经验")
+    private String workExp;
+
+    @ApiModelProperty("是否是消费者")
+    private Integer isConsumer;
+
+    @ApiModelProperty("其他品牌")
+    private String otherBand;
+
+    @ApiModelProperty("品牌优势")
+    private String brandStrength;
+
+    @ApiModelProperty("需要改进")
+    private String needImprove;
+
+    @ApiModelProperty("优势")
+    private String strength;
+
+    @ApiModelProperty("劣势")
+    private String weakness;
+
+    @ApiModelProperty("提交标识  提交-true   暂存-false")
+    private Boolean submitFlag;
+
+}

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

@@ -30,10 +30,10 @@ public class LineRequest extends PageInfoRequest{
     private Integer acceptAdjustType;
 
     @ApiModelProperty("更新开始时间")
-    private Date updateStartTime;
+    private String updateStartTime;
 
     @ApiModelProperty("更新结束时间")
-    private Date updateEndTime;
+    private String updateEndTime;
 
 
 

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

@@ -0,0 +1,51 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author wxp
+ * @Date 2023/5/30 15:14
+ * @Version 1.0
+ */
+@Data
+@ApiModel
+public class PartnerWantShopInfoRequest {
+
+    @ApiModelProperty("线索表ID")
+    private Long partnerLineId;
+
+    @ApiModelProperty("加盟商C端用户表ID   partnerId ")
+    private String partnerId;
+
+    @ApiModelProperty("常驻区域")
+    private String liveArea;
+
+    @ApiModelProperty("意向开店区域")
+    private String wantShopArea;
+
+    @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
+    private Integer acceptAdjustType;
+
+    @ApiModelProperty("是否有意向铺位")
+    private Integer isHaveWantShop;
+
+    @ApiModelProperty("意向铺位信息,json字段,最多5个")
+    private List<WantShopInfoRequest> wantShopInfo;
+
+    @ApiModelProperty("最大预算")
+    private String maxBudget;
+
+    @ApiModelProperty("资金来源 1自有资金;2借贷资金;3部分自有、部分借代;4部分自有、部分亲友借代")
+    private String moneySource;
+
+    @ApiModelProperty("资金证明")
+    private List<String> moneyProve;
+
+    @ApiModelProperty("提交标识  提交-true   暂存-false")
+    private Boolean submitFlag;
+
+}

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

@@ -51,6 +51,9 @@ public class PartnerInterviewInfoVO {
     @ApiModelProperty("面试官名称")
     private String interviewerName;
 
+    @ApiModelProperty("面试官手机号")
+    private String interviewerPhone;
+
     @ApiModelProperty("预约时间")
     private String createTime;