Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

liyong

9 天以前 ca0565e53494417b3779759f8d3898e07bfd5929

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

    }



    /**