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

lidongdong

2022-11-18 3ff198d0d2d88eb940a2b0eeb6da9e03a152df1d

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

@@ -195,9 +195,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,null,"1");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,null,keyword,null,"1");

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