Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

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