From 0de4720110cc7ce35d1565bdd5706d6b9a0b3982 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Fri, 18 Jun 2021 22:10:24 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java index 0c313f0..ff883d8 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java @@ -228,6 +228,7 @@ * 开始时间 */ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date beginTime; @@ -235,6 +236,7 @@ * 结束时间 */ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private Date endTime; -- Gitblit v1.9.1