Merge branch 'huacheng_test' into huacheng

101captain

2022-06-17 871972f549897b9cf3d9bd9da8ebfc897dc9fb1a

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java

@@ -84,7 +84,9 @@
        if(StringUtils.isNotEmpty(comMngVillageVO.getName())){
            param.like(ComMngVillageDO::getName, comMngVillageVO.getName());
        }
        if(comMngVillageVO.getCommunityId()!=0){
        param.eq(ComMngVillageDO::getCommunityId, comMngVillageVO.getCommunityId());
        }
        List<ComMngVillageDO> comMngVillageDOS = comActVillageDAO.selectList(param);
        BeanUtils.copyProperties(comMngVillageDOS, vos);
        return R.ok(comMngVillageDOS);