From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceVO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceVO.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceVO.java
index 3157bcb..ec328d0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceVO.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/IntroduceVO.java
@@ -23,9 +23,9 @@
*/
private Integer id;
private String provinceAndCity;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date startTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date endTime;
private Integer giveClass;
private Integer number;
--
Gitblit v1.7.1