From 835f6562bd7a83fd156c0bc8b9e48b3e6fe3f5ee Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 29 Oct 2021 07:34:50 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/activity/vo/ZjrVo.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/ZjrVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/ZjrVo.java
index bbef08c..e6d9c7d 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/vo/ZjrVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/ZjrVo.java
@@ -1,11 +1,10 @@
package com.matrix.system.activity.vo;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
@Data
public class ZjrVo {
@@ -13,7 +12,7 @@
private String zjr;
@ApiModelProperty(value ="中奖时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
private Date zjsj;
}
--
Gitblit v1.9.1