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

935090232@qq.com

2022-02-17 bc4420f7a0ba1d243abcbea44b2203e2f6c6bc11

 zq-erp/src/main/java/com/matrix/system/hive/bean/ServiceRecord.java

@@ -1,6 +1,6 @@
package com.matrix.system.hive.bean;

import com.matrix.system.hive.plugin.util.DateUtils;
import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
@@ -35,12 +35,12 @@
   /**
    * 创建时间
    */
   @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
   @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
   private Date  createTime;
   /**
    * 下次跟进时间
    */
   @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
   @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
   private Date  followTime;
   /**
    * 内容