From 7b973b3b9b723f48c54f2c0c5083886573224541 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 05 一月 2026 16:40:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
index 12a61a6..94feed3 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java
@@ -121,7 +121,7 @@
         view.put("allArea", allArea);
 
         //鑾峰彇鎵�鏈夊簱鍖�
-        List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
+        List<GroupDeptData> deptList = groupManager.getDeptData(user.getCompanyId());
         view.put("deptList", deptList);
 
         //缁熻淇℃伅

--
Gitblit v1.9.3