From 0b4861205adec36924244d7dbbcfcf048c620d90 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 14 Dec 2020 21:45:51 +0800
Subject: [PATCH] Merge branch 'master' into test

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
index 524a8d2..3169b9d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
@@ -1,7 +1,7 @@
 package com.matrix.system.hive.bean;
 
 import com.matrix.core.anotations.Extend;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
 import com.matrix.system.hive.plugin.util.MoneyUtil;
 import com.matrix.system.hive.pojo.MoneyCardUserVo;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -67,7 +67,7 @@
 	/**
 	 * 失效时间
 	 */
-	@DateTimeFormat(pattern= DateUtils.DATE_FORMAT_DD)
+	@DateTimeFormat(pattern= DateUtil.DATE_FORMAT_DD)
 	private Date  failTime;
 			
 	

--
Gitblit v1.9.1