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

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

@@ -0,0 +1,22 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author wxp
+ * @Date 2023/6/21 14:27
+ * @Version 1.0
+ */
+@Data
+@ApiModel
+public class CoolDownFirstLoginFlagDelRequest {
+
+    @NotBlank(message = "线索id不能为空")
+    @ApiModelProperty("线索id")
+    private Long lineId;
+
+}

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

@@ -34,11 +34,11 @@ public class PartnerLineBaseInfoVO {
     private String workflowStatus;
 
     @ApiModelProperty("当前阶段截止时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy.MM.dd HH:mm", timezone = "GMT+8")
     private Date deadline;
 
     @ApiModelProperty("结束跟进时间 冷静期使用 计算15天还剩多少天")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy.MM.dd HH:mm", timezone = "GMT+8")
     private Date closeTime;
 
     @ApiModelProperty("冷静期首次登录标识 true-是首次")
@@ -47,5 +47,8 @@ public class PartnerLineBaseInfoVO {
     @ApiModelProperty("拒绝原因  冷静期提示文案中用到 全部流程中用到(拒绝的时候暂时拒绝原因)")
     private String cause;
 
+    @ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单")
+    private Integer lineStatus;
+
 
 }