From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/domain/form/MeetForm.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java b/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java
index ff451ce..e6ea851 100644
--- a/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java
+++ b/src/main/java/com/ycl/jxkg/domain/form/MeetForm.java
@@ -43,15 +43,14 @@
@NotNull(message = "寮�濮嬫椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date startTime;
@NotNull(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date endTime;
- @NotNull(message = "鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉熶笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鐘舵�� 0/1/2 鏈紑濮�/杩涜涓�/宸茬粨鏉�")
private Integer status;
--
Gitblit v1.8.0