From aafd58ca236ea5f9b66d9759121053c16fb87fe6 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 11 Sep 2021 17:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/ServiceRecordServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ServiceRecordServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ServiceRecordServiceImpl.java
index 3d3584c..42ea7ae 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ServiceRecordServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ServiceRecordServiceImpl.java
@@ -26,7 +26,7 @@
 	@Override
 	public int add(ServiceRecord serviceRecord){
 //		Date now=new Date();
-//		if(DateUtils.isAffterDate( serviceRecord.getCreateTime(),now)){
+//		if(DateUtil.isAffterDate( serviceRecord.getCreateTime(),now)){
 //			throw new GlobleException("跟进时间必须大于当前时间");
 //		}
 

--
Gitblit v1.9.1