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

huanghongfa

2021-07-26 86c9e373f05d67cc3cd11657f6d9a93bebb16c53

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComMngVillageDTO.java

@@ -9,7 +9,7 @@
 * @description: 实有房屋
 **/
@Data
@ApiModel("实有房屋请求参数")
@ApiModel("小区请求参数")
public class PageComMngVillageDTO {

    @ApiModelProperty("街路巷")

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

@@ -396,7 +396,7 @@
            ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
            if (comMngVillageDO == null) {
                ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                importErrorVO.setErrorMsg("街路巷或小区号不存在");
                importErrorVO.setErrorMsg("街路巷或小区号不存在，请先在“小区管理”中添加该小区");
                importErrorVO.setErrorPosition("街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
                populationImportErrorVOList.add(importErrorVO);
//                index++;