From 4f4fd43c199ff802df896256bc012a7277fdd4a1 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 25 Sep 2021 09:00:39 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java index af7d6a6..9dea112 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java @@ -39,7 +39,7 @@ private int state; @ApiModelProperty(value ="兑奖时间") - @JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8") private Date djsj; @ApiModelProperty(value ="收货人") -- Gitblit v1.9.1