From 6ada97d503bd93722c081b66a9adcce7599e5536 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Wed, 14 Apr 2021 17:31:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java index 6fb1263..47689ff 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java @@ -7,6 +7,8 @@ import java.util.Date; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; + @Data @ApiModel(value = "SignBasicInfoVo", description = "签到活动") @@ -27,8 +29,10 @@ @ApiModelProperty(value ="活动编码") private String actCode; @ApiModelProperty(value ="活动开始时间") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8") private Date beginTime; @ApiModelProperty(value ="活动结束时间") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8") private Date endTime; @ApiModelProperty(value ="活动基本参数") private SignBasicInfoJsonVo signBasicInfoJsonVo; -- Gitblit v1.9.1