From 0e12140d6ceac7fa10093df2d3ca395ee1501386 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 14:14:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
index 92b030c..069ed5b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
@@ -1,9 +1,11 @@
 package com.ycl.platform.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ycl.platform.base.AbsVo;
 import com.ycl.platform.domain.entity.YwPoint;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 import enumeration.general.ImportantTagEnum;
@@ -26,10 +28,12 @@
     private String pointName;
 
     /** 鐐逛綅寮�濮嬫椂闂� */
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
 
     /** 鐐逛綅缁撴潫鏃堕棿 */
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
 
     /** 杩愮淮鍗曚綅 */
     private Long unitId;

--
Gitblit v1.8.0