Merge remote-tracking branch 'bozhu-origin/4.x_dev' into 4.x_dev

# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
#	ruoyi-ui/src/views/monitor/operlog/index.vue

ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java

@@ -126,6 +126,13 @@ public class LoginHelper {
         return getLoginUser().getUsername();
     }
 
+    /**
+     * 获取用户部门名称
+     */
+    public static String getDeptName() {
+        return getLoginUser().getDeptName();
+    }
+
     /**
      * 获取用户类型
      */