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

lidongdong

2022-10-24 5256abe57aabebffc7254ea33ef29f4d3629ab2f

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

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -182,9 +182,9 @@
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null);

        int num=IUserService.selectNum("3",keyword);
        int num=IUserService.selectNum("3",keyword,null);
        return getDataTable(list,num);
    }