From e7ab049344b954b044fc474992c378fcbbeeba33 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 08 二月 2026 19:08:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java
index d46a60f..d2f95d2 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java
@@ -29,6 +29,10 @@
     @TableField("id")
     private String id;
 
+    @Column(name = "parent_id", columnDefinition = "varchar(40) COMMENT '鏀跺偍鍏徃'")
+    @TableField("parent_id")
+    private String parentId;
+
     @Column(name = "kqmc", columnDefinition = "varchar(256) COMMENT '搴撳尯鍚嶇О'")
     @TableField("kqmc")
     private String kqmc;
@@ -72,16 +76,12 @@
     /**
      * --------楦熺灠鍥句俊鎭�--------
      **/
-    @Column(name = "img_id", columnDefinition = "varchar(50) COMMENT '楦熺灠鍥緄d'")
-    @TableField("img_id")
-    private String imgId;
-
-    @Column(name = "file_name", columnDefinition = "varchar(50) COMMENT '楦熺灠鍥惧悕绉�'")
-    @TableField("file_name")
-    private String imgName;
-
-    //楦熺灠鍥惧叏璺緞
-    @Transient
+    @Column(name = "img_path", columnDefinition = "varchar(100) COMMENT '楦熺灠鍥惧叏璺緞'")
+    @TableField("img_path")
     private String imgPath;
 
+    @Column(name = "img_name", columnDefinition = "varchar(50) COMMENT '楦熺灠鍥惧悕绉�'")
+    @TableField("img_name")
+    private String imgName;
+
 }
\ No newline at end of file

--
Gitblit v1.9.3