解决代码冲突

src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java

@@ -139,14 +139,14 @@ public class ApplicationEvent {
 //            pointService.syncOilBuy(initDomain(List.of(52)));
 //            jsbryService.syncPys(initDomain(List.of(59)));
 
-//            pointService.syncIsPetition(initDomain(List.of(101)));
+//            pointService.syncIsPetition(initDomain(List.of(111)));
-//            pointService.syncFatherEducation(initDomain(List.of(102)));
+//            pointService.syncFatherEducation(initDomain(List.of(112)));
-//            pointService.syncMotherEducation(initDomain(List.of(103)));
+//            pointService.syncMotherEducation(initDomain(List.of(113)));
-//            pointService.syncDomicileType(initDomain(List.of(104)));
+//            pointService.syncDomicileType(initDomain(List.of(114)));
 //            pointService.syncCriminalPunishment(initDomain(List.of(115)));
 //            pointService.syncAdministrativePunishment(initDomain(List.of(116)));
 //            pointService.syncParentsDivorce(initDomain(List.of(117)));
-//            pointService.syncFamilyDie(initDomain(List.of(118))); // 未完成
+            pointService.syncFamilyDie(initDomain(List.of(118))); // 未完成
 
 
             // *********暂时不要**********