From 0649fb5e05730a8f8bf15b0fe019a7227361f1af Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:29 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/action/StoreInOutController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/StoreInOutController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/StoreInOutController.java
index a8714ca..8245e54 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/StoreInOutController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/StoreInOutController.java
@@ -11,7 +11,7 @@
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.SysCheckInfo;
import com.matrix.system.hive.dao.SysStoreInfoDao;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.pojo.StoreInOutRecordVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -88,7 +88,7 @@
if (dataList.size() > 0) {
for (StoreInOutRecordVO item : dataList) {
List<Object> temp = new ArrayList<>();
- String strDate = DateUtils.dateToString(item.getCreateTime(), DateUtils.DATE_FORMAT_MM);
+ String strDate = DateUtil.dateToString(item.getCreateTime(), DateUtil.DATE_FORMAT_MM);
temp.add(strDate);
temp.add(item.getCode());
temp.add(item.getName());
--
Gitblit v1.9.1