Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-11-15 46c5ed0e7f09b6fce7b19e3825970c3b031a5858

 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);
    }
}