From 62b534e96922a3911f61845753ee0d126bafd6e1 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 09 Mar 2021 11:51:14 +0800 Subject: [PATCH] Merge branch 'api' into hive2.0 --- zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java index 11bca7e..1350bdb 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java @@ -43,6 +43,8 @@ /** * 订单划扣时间 */ + @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private Date consumeTime; /** -- Gitblit v1.9.1