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

This commit is contained in:
苏竹红
2023-06-20 22:27:53 +08:00

View File

@@ -1,5 +1,7 @@
package com.cool.store.vo; package com.cool.store.vo;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -32,9 +34,11 @@ public class PartnerLineBaseInfoVO {
private String workflowStatus; private String workflowStatus;
@ApiModelProperty("当前阶段截止时间") @ApiModelProperty("当前阶段截止时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date deadline; private Date deadline;
@ApiModelProperty("结束跟进时间 冷静期使用 计算15天还剩多少天") @ApiModelProperty("结束跟进时间 冷静期使用 计算15天还剩多少天")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date closeTime; private Date closeTime;
@ApiModelProperty("冷静期首次登录标识 true-是首次") @ApiModelProperty("冷静期首次登录标识 true-是首次")