From b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 12 十二月 2025 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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..b9a4aa3 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
@@ -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")

--
Gitblit v1.9.3