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

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

@@ -418,7 +418,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                 icNeighborHoodDao.deleteBatchIds(ids);
             }
             if (!CollectionUtils.isEmpty(exists)){
-                String collect = exists.stream().map(m -> m.getName()).collect(Collectors.joining("、"));
+                String collect = exists.stream().map(m -> m.getName()).collect(Collectors.joining(","));
                 EpmetErrorCode.NEIGHBORHOOD_DEL_FAILED.setMsg(String.format(EpmetErrorCode.NEIGHBORHOOD_DEL_FAILED.getMsg(),collect));
                 throw new EpmetException(EpmetErrorCode.NEIGHBORHOOD_DEL_FAILED.getCode());
             }
@@ -438,7 +438,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
                 icBuildingDao.deleteBatchIds(ids);
             }
             if (!CollectionUtils.isEmpty(exists)){
-                String collect = exists.stream().map(m -> m.getName()).collect(Collectors.joining("、"));
+                String collect = exists.stream().map(m -> m.getName()).collect(Collectors.joining(","));
                 EpmetErrorCode.BUILDING_DEL_FAILED.setMsg(String.format(EpmetErrorCode.BUILDING_DEL_FAILED.getMsg(),collect));
                 throw new EpmetException(EpmetErrorCode.BUILDING_DEL_FAILED.getCode());
             }
@@ -463,7 +463,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             }
             if (!CollectionUtils.isEmpty(exists)){
                 List<String> list = icHouseDao.selectHouseNames(exists);
-                String collect = list.stream().collect(Collectors.joining("、"));
+                String collect = list.stream().collect(Collectors.joining(","));
                 EpmetErrorCode.HOUSE_DEL_FAILED.setMsg(String.format(EpmetErrorCode.HOUSE_DEL_FAILED.getMsg(),collect));
                 throw new EpmetException(EpmetErrorCode.HOUSE_DEL_FAILED.getCode());
             }