From 63c985f072826e7c82f51b0f415454a066fd8c56 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 30 一月 2023 16:26:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
index 6b61c82..bcc1744 100644
--- a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
@@ -42,7 +42,6 @@
         {
             return getDataTable("分页不能为空");
         }
-
         if(pageSize==null)
         {
             return getDataTable("分页条数不能为空");

--
Gitblit v1.7.1