From 11899dc62d10c1c7778fbebb631f5ee25705b7db Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 21:36:08 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java
index 19ca722..0a33994 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/RoleManagementImpl.java
@@ -12,8 +12,8 @@
@Service
public class RoleManagementImpl extends ServiceImpl<RoleManagementMapper, RoleManagementEntity> implements IRoleManagementService {
@Override
- public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state) {
- return baseMapper.selectConfigList(page,state);
+ public List<RoleManagementEntity> selectConfigList(IPage<RoleManagementEntity> page, Integer state,String name) {
+ return baseMapper.selectConfigList(page,state,name);
}
@Override
@@ -32,7 +32,7 @@
}
@Override
- public int countNum() {
- return baseMapper.countNum();
+ public int countNum(String name) {
+ return baseMapper.countNum(name);
}
}
--
Gitblit v1.7.1