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/bean/SysOutStore.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOutStore.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOutStore.java
index d7197e0..bbda400 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOutStore.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOutStore.java
@@ -1,7 +1,7 @@
 package com.matrix.system.hive.bean;
 
 import com.matrix.core.pojo.EntityDTO;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -34,7 +34,7 @@
 	/**
 	 * 出库时间
 	 */
-	@DateTimeFormat(pattern= DateUtils.DATE_FORMAT_MM)
+	@DateTimeFormat(pattern= DateUtil.DATE_FORMAT_MM)
 	private Date time;
 
 	/**

--
Gitblit v1.9.1