Merge remote-tracking branch 'origin/master'

ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -848,7 +848,8 @@ public class ClueServiceImpl implements ClueService {
         clueMiddle.setClueType(crmClueType);
         clueMiddle.setMemberStatus(DefaultNumberConstants.TWO_NUMBER);
         clueMiddle.setClueStage(DefaultNumberConstants.TWO_NUMBER);
-        clueMiddle.setClueStageTime(new Date());
+        clueMiddle.setClueStageTime(DateUtil.date());
+        clueMiddle.setCreateTime(DateUtil.date());
         clueMiddle.setOptimisticVersion(DefaultNumberConstants.ZERO_NUMBER);
         clueMiddleRepository.save(clueMiddle);
         clueTalk.setMemberStatus(DefaultNumberConstants.FOUR_NUMBER);

ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/PublicCluePoolServiceImpl.java

@@ -2,6 +2,7 @@ package com.baiye.module.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baiye.exception.BadRequestException;
 import com.baiye.feign.UserClient;
 import com.baiye.model.dto.PublicCluePoolDto;
@@ -117,6 +118,7 @@ public class PublicCluePoolServiceImpl implements PublicCluePoolService {
         clueMiddle.setOrganizeId(userInfo.getOrganizeId());
         clueMiddle.setPublicPoolStatus(0);
         clueMiddle.setMemberStatus(1);
+        clueMiddle.setCreateTime(DateUtil.date());
         clueMiddle.setOptimisticVersion(clueMiddle.getOptimisticVersion() + 1);
         clueMiddleRepository.save(clueMiddle);
     }