Merge remote-tracking branch 'origin/房屋tree_yzm' into dev

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -441,7 +441,7 @@ public class BuildingServiceImpl implements BuildingService {
             LambdaQueryWrapper<IcBuildingEntity> buildingQueryWrapper = new QueryWrapper<IcBuildingEntity>().lambda()
                     .eq(IcBuildingEntity::getNeighborHoodId, neighborHood.getId());
             neighborHood.setShowNum(String.valueOf(icBuildingDao.selectCount(buildingQueryWrapper)));
-            neighborHood.setShowNum(String.format("%s(%s)", neighborHood.getLabel(), neighborHood.getShowNum()));
+            neighborHood.setShowName(String.format("%s(%s)", neighborHood.getLabel(), neighborHood.getShowNum()));
             list.add(neighborHood);
         });
         return list;