diff --git a/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java b/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
index b31c6d3..984ce88 100644
--- a/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
+++ b/src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
@@ -577,6 +577,8 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
                             houseDTO -> houseDTO));
         }
 
+        populationInfoBaseDTOs.removeAll(Collections.singleton(null));
+
         if (!CollectionUtils.isEmpty(populationInfoBaseDTOs)) {
             baseMap = populationInfoBaseDTOs.stream()
                     .collect(Collectors.toMap(PopulationInfoBaseDTO::getPopulationInfoId,
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 1a724d4..58ae8c1 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -62,7 +62,7 @@ swagger:
 
 # 文件
 file:
-  uploadPath: D:\CF_work\ideaWorkSpace\uploadFiles\
+  uploadPath: E:\CF_work\ideaWorkSpace\uploadFiles\
   imageTypes: png,jpg,jpeg,gif,blob
   videoTypes: mp4
   audioTypes: mp3,wav,amr
@@ -128,13 +128,13 @@ logging:
 
 
 server-other:
-  area-url: http://192.168.0.15:7022/servicecity
+  area-url: http://127.0.0.1:7022/servicecity
   population-update-log: true
   population-insert-log: true
   population-delete-log: false
 
 camera:
-  ffmpeg-path: D:\CF_work\ffmpeg\ffmpeg-2023-11-28-git-47e214245b-essentials_build\bin\ffmpeg.exe
+  ffmpeg-path: E:\CF_work\ffmpeg\ffmpeg-2023-11-28-git-47e214245b-essentials_build\bin\ffmpeg.exe
   rtmp-play:
     ip: 127.0.0.1
     port: 8081