Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-16 473dee8739de376e54bef5bbfbdd0f45eca38e9a

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

@@ -197,7 +197,7 @@
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null,"1");

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