Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

张天森

2022-12-08 79e0d3094c1fcf9025938479b6e46d2e9dfebdb6

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

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

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