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

liyong

昨天 2cc19f8033348f34df382d27f63810b2d6f56a05

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

    }



    /**