Merge branch 'master' into pim_zss

zss

2025-09-22 bc041bbe418b340af60fafd1c4e15463624e96e3

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

    }



    /**