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

liyong

16 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

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

    }



    /**