Merge branch 'feature_bug' into dev

src/views/components/editResi.vue

@@ -1126,6 +1126,7 @@ export default {
               opctionUrl: "sys/dict/data/dictlist",
               opctionParams: { dictType: "reside_situation" },
               pformName: "oldPeopleDto",
+              opction:[]
             },
             {
               label: "高龄补助",