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/RoleManagementController.java

@@ -42,7 +42,6 @@
        {
            return getDataTable("分页不能为空");
        }

        if(pageSize==null)
        {
            return getDataTable("分页条数不能为空");