Merge remote-tracking branch 'origin/master'

无关风月

92 分钟以前 3548f8f669884e1caf9f037a726394464eb85d44

 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();
    }