Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

昨天 f6e755678fab0ccd8001523d29dc2efaa8d5810c

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

    }



    /**