From 5989a593451ce3a64d3e1a66d6472c1c38175541 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 七月 2025 15:38:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 7497d8c..6033705 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -190,7 +190,7 @@
     /**
      * 获取登录部门id
      */
-    public Long getDeptId()
+    public String getDeptId()
     {
         return getLoginUser().getDeptId();
     }

--
Gitblit v1.7.1