From 97372541208141dd927ecb786168d5bc5b938cc2 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 04 十二月 2025 11:42:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
index 19aa3fd..2344a0b 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,7 +11,13 @@
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
+import java.util.Date;
+/**
+ * @Description 鐢靛瓙宸￠�婚厤缃�
+ * @Author sgj
+ * @Date 2025/12/04 11:38
+ */
@Data
@Entity
@Table(name = "d_patrol_conf")
@@ -32,8 +39,15 @@
@TableField("batch_name")
private String batchName;
- @Column(name = "user_name", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉'")
- @TableField("user_name")
- private String userName;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Column(name = "start_time", columnDefinition = "datetime COMMENT '宸￠�诲紑濮嬫椂闂�'")
+ @TableField("start_time")
+ private Date startTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Column(name = "end_time", columnDefinition = "datetime COMMENT '宸￠�荤粨鏉熸椂闂�'")
+ @TableField("end_time")
+ private Date endTime;
+
}
--
Gitblit v1.9.3