From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysAllottedInfo.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysAllottedInfo.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysAllottedInfo.java
index 66754fd..13187bc 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysAllottedInfo.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysAllottedInfo.java
@@ -1,6 +1,6 @@
package com.matrix.system.hive.bean;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -68,7 +68,7 @@
/**
* 调拨日期
*/
- @DateTimeFormat(pattern= DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern= DateUtil.DATE_FORMAT_MM)
private Date allottedDate;
@@ -150,9 +150,9 @@
* 审核人
*/
private String appManName;
- @DateTimeFormat(pattern=DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern=DateUtil.DATE_FORMAT_MM)
private Date startTime;
- @DateTimeFormat(pattern=DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern=DateUtil.DATE_FORMAT_MM)
private Date endTime;
public Long getId() {
--
Gitblit v1.9.1