From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hive/action/AllottedInfoController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/AllottedInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/AllottedInfoController.java
index c4b95bd..a618470 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/AllottedInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/AllottedInfoController.java
@@ -17,7 +17,7 @@
import com.matrix.system.hive.bean.SysAllotDetail;
import com.matrix.system.hive.bean.SysAllottedInfo;
import com.matrix.system.hive.dao.SysAllotDetailDao;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.service.SysAllottedInfoService;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@@ -317,7 +317,7 @@
temp.add(item.getAllottedOutstoreName());
temp.add(item.getAllottedInstoreName());
temp.add(item.getCheckStatus());
- temp.add(DateUtils.dateToString(item.getAllottedDate(), DateUtils.DATE_FORMAT_MM));
+ temp.add(DateUtil.dateToString(item.getAllottedDate(), DateUtil.DATE_FORMAT_MM));
temp.add(item.getMakingManName());
temp.add(item.getAppManName());
temp.add(item.getAllottedRemark());
--
Gitblit v1.9.1