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

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
index dab8936..e24e6d6 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
@@ -5,6 +5,8 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ycl.platform.base.AbsEntity;
+import enumeration.general.ImportantTagEnum;
+import enumeration.general.ProvinceTagEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,13 +35,13 @@
 
     @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
     @TableField("start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startTime;
 
     @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
     @TableField("end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endTime;
 
     @ApiModelProperty("杩愮淮鍗曚綅")
     @TableField(value = "unit_id", updateStrategy = FieldStrategy.IGNORED)
@@ -61,8 +63,16 @@
     @TableField("dept_id")
     private Long deptId;
 
-    @TableField("point_tag")
-    private String pointTag;
+    @ApiModelProperty("閲嶇偣鐐逛綅鏍囩")
+    @TableField("important_tag")
+    private ImportantTagEnum importantTag;
+
+    @ApiModelProperty("鐪佸巺鐐逛綅鏍囩")
+    @TableField("province_tag")
+    private ProvinceTagEnum provinceTag;
+
+    @TableField("serial_number")
+    private String serialNumber;
 
     @TableField("reason")
     private String reason;
@@ -74,4 +84,5 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date recoveryTime;
 
+
 }

--
Gitblit v1.8.0