Merge branch 'dev_tide_gybjyhglxt' into dev_tide_gybjyhglxt_xindao

zouyu

3 天以前 0febd1ea7218cf2ae28cad07912bf6ba7b881d2c

 src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -72,7 +72,7 @@
     * @return 用户信息集合信息

     */

    @Override

    @DataScope(deptAlias = "d", userAlias = "u")

    @DataScope(tenantIdFelid = "u")

    public List<SysUser> selectUserList(SysUser user)

    {

        return userMapper.selectUserList(user);