From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Tue, 22 Feb 2022 23:41:42 +0800 Subject: [PATCH] Merge branch 'developer' --- zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java index 25a4de4..266437e 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysInstoreInfo.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; 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; @@ -18,6 +18,7 @@ private static final long serialVersionUID = 1L; + public static final String INSTORE_TYPE_RETURN = "退货入库"; /** * 序号 @@ -28,7 +29,7 @@ /** * 入库日期 */ - @DateTimeFormat(pattern= DateUtils.DATE_FORMAT_MM) + @DateTimeFormat(pattern= DateUtil.DATE_FORMAT_MM) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8") private Date instoreDate; @@ -126,13 +127,13 @@ * 开始时间 */ - @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; private Long shopId; -- Gitblit v1.9.1