From dfd2060bdcc0de929b4770a6a4a580c17bd72104 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 17 十二月 2025 16:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
index 36be5ee..3f3a7c8 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
@@ -22,7 +22,7 @@
private static final long serialVersionUID = 1L;
@Id
- @Column(name = "id", columnDefinition = "varchar(40) COMMENT '涓婚敭'")
+ @Column(name = "id", columnDefinition = "varchar(8) COMMENT '涓婚敭(ID瑙勫垯锛歽yyyMMdd)'")
@TableField("id")
private String id;
@@ -32,9 +32,13 @@
private String userId;
@Id
- @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
- @TableField("batch_id")
- private String batchId;
+ @Column(name = "conf_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
+ @TableField("conf_id")
+ private String confId;
+
+ @Column(name = "conf_name", columnDefinition = "varchar(40) COMMENT '鐝鍚嶇О'")
+ @TableField("conf_name")
+ private String confName;
@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
@TableField("dept_id")
@@ -44,4 +48,8 @@
@TableField("user_name")
private String userName;
+ @Column(name = "remark", columnDefinition = "varchar(200) COMMENT '澶囨敞璇存槑'")
+ @TableField("remark")
+ private String remark;
+
}
--
Gitblit v1.9.3