Merge branch 'fix_bug' into dev

src/views/components/editResi.vue

@@ -1606,7 +1606,13 @@ export default {
                 employmentWish: null, //劳动能力就业愿望
               };
             }
-
+            if (!res.data.data.oldPeopleDto) {
+              this.form.oldPeopleDto = {
+                    oldPeopleCategories: [],
+                    resideSituation: null,
+                    oldSubsidy: null
+                };
+            }
             for (const key in this.form.baseInfoDto.categoryInfo) {
               if (
                 (this.form.baseInfoDto.categoryInfo[key] === 1 &&
@@ -2090,7 +2096,6 @@ export default {
             );
         }
       }
-
       // 处理 incidence
       if (this.incidence[value]) {
         if (event) {