From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +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