diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java index 850ebc93d..acdd84729 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java @@ -16,9 +16,9 @@ import java.util.Date; public class LineFollowHistoryVO { @ApiModelProperty("开始跟进时间") - private Date startTime; + private String startTime; @ApiModelProperty("结束跟进时间") - private Date closeTime; + private String closeTime; @ApiModelProperty("结束原因") private String closeCause; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index f3b5b047f..3417d39e2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -394,8 +394,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { lineFollowHistoryList.forEach(x->{ LineFollowHistoryVO lineFollowHistoryVO = new LineFollowHistoryVO(); lineFollowHistoryVO.setCloseCause(x.getRejectPublicReason()); - lineFollowHistoryVO.setCloseTime(x.getCloseTime()); - lineFollowHistoryVO.setStartTime(x.getCreateTime()); + lineFollowHistoryVO.setCloseTime( DateUtil.format(x.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC)); + lineFollowHistoryVO.setStartTime(DateUtil.format(x.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC)); result.add(lineFollowHistoryVO); }); return result;