From beb6e85c9b054e8edced241c3367814a0a19d70c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 11:42:38 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java b/zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java
index 4673d29..654f4d8 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java
@@ -2,7 +2,7 @@
import com.matrix.core.constance.MatrixConstance;
import com.matrix.system.common.dao.UtilDao;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -166,11 +166,11 @@
int s=Integer.parseInt(max);
s=s+1;
if(s>=1000){
- return DateUtils.getTimeCode();
+ return DateUtil.getTimeCode();
}
return s>=10?(s>=100?s+"":"00"+s):"000"+s; // 计算 转型
}catch(Exception e){
- return DateUtils.getTimeCode();
+ return DateUtil.getTimeCode();
}
--
Gitblit v1.9.1