fix(核查模块): 临时修复数据合并出的异常问题

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckAreaStatVo.java

@@ -113,10 +113,10 @@ public class CheckAreaStatVo implements Cloneable {
             if (this.areaDetailId == 0) {
                 this.areaDetailId = other.areaDetailId;
             } else {
-                throw new IllegalArgumentException(String.format(
-                        "要合并的两个地区统计数据的areaName与areaDetailId必须保持一致，" +
-                                "你提供的分别是areaName = %s 与 %s , areaDetailId = %d 与 %d %n",
-                        this.areaName, other.areaName, this.areaDetailId, other.areaDetailId));
+//                throw new IllegalArgumentException(String.format(
+//                        "要合并的两个地区统计数据的areaName与areaDetailId必须保持一致，" +
+//                                "你提供的分别是areaName = %s 与 %s , areaDetailId = %d 与 %d %n",
+//                        this.areaName, other.areaName, this.areaDetailId, other.areaDetailId));
             }
         }
 
@@ -125,10 +125,10 @@ public class CheckAreaStatVo implements Cloneable {
             if (this.areaStatId == 0) {
                 this.areaStatId = other.areaStatId;
             } else {
-                throw new IllegalArgumentException(String.format(
-                        "要合并的两个地区统计数据的areaName与areaStatId必须保持一致，" +
-                                "你提供的分别是areaName = %s 与 %s , areaStatId = %d 与 %d %n",
-                        this.areaName, other.areaName, this.areaStatId, other.areaStatId));
+//                throw new IllegalArgumentException(String.format(
+//                        "要合并的两个地区统计数据的areaName与areaStatId必须保持一致，" +
+//                                "你提供的分别是areaName = %s 与 %s , areaStatId = %d 与 %d %n",
+//                        this.areaName, other.areaName, this.areaStatId, other.areaStatId));
             }
         }
 
@@ -161,10 +161,10 @@ public class CheckAreaStatVo implements Cloneable {
             if (this.areaDetailId == 0) {
                 this.areaDetailId = other.areaDetailId;
             } else {
-                throw new IllegalArgumentException(String.format(
-                        "要合并的两个地区统计数据的areaName与areaDetailId必须保持一致，" +
-                                "你提供的分别是areaName = %s 与 %s , areaDetailId = %d 与 %d %n",
-                        this.areaName, other.areaName, this.areaDetailId, other.areaDetailId));
+//                throw new IllegalArgumentException(String.format(
+//                        "要合并的两个地区统计数据的areaName与areaDetailId必须保持一致，" +
+//                                "你提供的分别是areaName = %s 与 %s , areaDetailId = %d 与 %d %n",
+//                        this.areaName, other.areaName, this.areaDetailId, other.areaDetailId));
             }
         }
 
@@ -173,10 +173,10 @@ public class CheckAreaStatVo implements Cloneable {
             if (this.areaStatId == 0) {
                 this.areaStatId = other.areaStatId;
             } else {
-                throw new IllegalArgumentException(String.format(
-                        "要合并的两个地区统计数据的areaName与areaStatId必须保持一致，" +
-                                "你提供的分别是areaName = %s 与 %s , areaStatId = %d 与 %d %n",
-                        this.areaName, other.areaName, this.areaStatId, other.areaStatId));
+//                throw new IllegalArgumentException(String.format(
+//                        "要合并的两个地区统计数据的areaName与areaStatId必须保持一致，" +
+//                                "你提供的分别是areaName = %s 与 %s , areaStatId = %d 与 %d %n",
+//                        this.areaName, other.areaName, this.areaStatId, other.areaStatId));
             }
         }