Merge branch 'feature_bug' into dev

src/views/components/addResi.vue

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