Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

chenhj

8 天以前 76640d343082d1473a482e7ba48461db9b26c035

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

    }



    /**