From b5f0c1c0ccc1def1b611abd2bc70403137c74722 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 25 Oct 2021 14:11:37 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java index 0ff34af..822e56e 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java @@ -66,7 +66,7 @@ * 开始时间 */ @ApiModelProperty(value = "开始时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8") private Date actBeginTime; @@ -74,7 +74,7 @@ * 结束时间 */ @ApiModelProperty(value = "结束时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8") private Date actEndTime; /** * 活动状态 -- Gitblit v1.9.1