From 7124c5de96ad9178274c3dc12c7f72435041e288 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 14:24:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java b/flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java
index 8c4dd20..3a0f311 100644
--- a/flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IRoleManagementService.java
@@ -13,7 +13,8 @@
      * @param state
      * @return
      */
-    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state);
+    public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page,
+                                                       Integer state,String name);
 
     /**
      * 新增角色
@@ -40,5 +41,5 @@
      * 统计条数
      * @return
      */
-    public int countNum();
+    public int countNum(String name);
 }

--
Gitblit v1.7.1