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/pojo/ShoppingOrderVo.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/pojo/ShoppingOrderVo.java b/zq-erp/src/main/java/com/matrix/system/hive/pojo/ShoppingOrderVo.java index 5a7190d..5a5c354 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/pojo/ShoppingOrderVo.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/pojo/ShoppingOrderVo.java @@ -2,7 +2,7 @@ import java.util.Date; -import com.matrix.system.hive.plugin.util.DateUtils; +import com.matrix.core.tools.DateUtil; import org.springframework.format.annotation.DateTimeFormat; @@ -16,12 +16,12 @@ /** * 开始时间 */ - @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM) + @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM) private Date startTime =new Date(); /** * 结束时间 */ - @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM) + @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM) private Date endTime; /** -- Gitblit v1.9.1