Merge branch 'dev_tide' into dev_tide_cbsglxt

zouyu

2 天以前 4809db01709fd66fe3a25452ef41a6378b6ac6c8

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