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

lidongdong

2022-10-19 9e01fedc84246726da1f60dbb0a48c36cb1b9769

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

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

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

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