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/Patrol.java |   23 +++++++++++++++++++----
 1 files changed, 19 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 81da056..b6e96eb 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
@@ -11,6 +11,12 @@
 import javax.persistence.Table;
 import java.io.Serializable;
 
+
+/**
+ * @Description 鐢靛瓙宸¢�昏褰曚富琛�
+ * @Author sgj
+ * @Date 2025/12/04 11:38
+ */
 @Data
 @Entity
 @Table(name = "d_patrol")
@@ -23,20 +29,29 @@
      */
     private static final long serialVersionUID = 1L;
 
+    //鐢熸垚瑙勫垯 骞存湀鏃�
     @Id
     @Column(name = "id", columnDefinition = "varchar(40) COMMENT '涓婚敭'")
     @TableField("id")
     private String id;
 
-    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
-    @TableField("dept_id")
-    private String deptId;
-
+    @Id
     @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
     @TableField("batch_id")
     private String batchId;
 
+    @Id
+    @Column(name = "user_id", columnDefinition = "varchar(40) COMMENT '宸¢�讳汉璐﹀彿'")
+    @TableField("user_id")
+    private String userId;
+
     @Column(name = "user_name", columnDefinition = "varchar(40) COMMENT '宸¢�讳汉'")
     @TableField("user_name")
     private String userName;
+
+    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+    @TableField("dept_id")
+    private String deptId;
+
+
 }

--
Gitblit v1.9.3