合并冲突

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

@@ -774,6 +774,7 @@ public class BuildingServiceImpl implements BuildingService {
      */
     @Override
     public List<IcBuildingDTO> buildingDistribution(String customerId, String gridId, String neighborHoodId) {
+        //随便加点注释
         List<IcBuildingDTO> list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId);
         return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class);
     }