From 889842eb8b64a0b72c449ce23ff21e4e8c935cae Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 七月 2024 16:06:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OrgDeptPO.java |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OrgDeptPO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OrgDeptPO.java
index 7d16413..27c5001 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OrgDeptPO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OrgDeptPO.java
@@ -28,12 +28,6 @@
     private String rowIndex;
 
     /**
-     * 涓婚敭
-     */
-    @ExcelColumn(value="ID")
-    private String id;
-
-    /**
      * 閮ㄩ棬鍚嶇О
      */
     @ExcelColumn(value="鍚嶇О",nullable = false)
@@ -60,8 +54,8 @@
     /**
      * 鐖秈d
      */
-    @ExcelColumn(value="鐖禝D锛堥儴闂ㄥ敮涓�鏍囪瘑ID锛�")
-    private String parentId;
+    @ExcelColumn(value="鐖堕儴闂ㄥ悕绉板叏璺緞锛�/闂撮殧锛�")
+    private String parentFullNamePath;
 
     /**
      * 鎻忚堪

--
Gitblit v1.9.3