Merge remote-tracking branch 'origin/master' into dev

* origin/master:
  居民信息组织选择，增加选项合并

src/views/components/resiSearch.vue

@@ -13,6 +13,7 @@
                              :options="orgOptions"
                              :props="orgOptionProps"
                              :show-all-levels="false"
+                             collapse-tags
                              @change="handleChangeAgency"></el-cascader>
               </div>
             </div>
@@ -314,7 +315,8 @@ export default {
       value: 'agencyId',
       label: 'agencyName',
       children: 'subAgencyList',
-      checkStrictly: true
+      checkStrictly: true,
+      
     }
 
     return {