Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

昨天 be43a6e71f665ce97c9fbf973bf43d24fdb24a54

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

@@ -555,9 +555,6 @@
     */

    @Override

    public List<SysUser> userListNoPage(SysUser user) {

        //获取登录用户信息

        SysUser loginUser = SecurityUtils.getLoginUser().getUser();

        user.setTenantId(loginUser.getTenantId());

        return userMapper.selectUserList(user);

    }