Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

9 天以前 0e0ef19a7bd74b2fde0089c28ad3d61d0bc2d911

 src/main/java/com/ruoyi/framework/web/controller/BaseController.java

@@ -179,9 +179,9 @@
    /**

     * 获取登录部门id

     */

    public Long getDeptId()

    public Long [] getDeptId()

    {

        return getLoginUser().getDeptId();

        return getLoginUser().getDeptIds();

    }



    /**