Merge branch 'dev-caiji' into test

src/views/modules/base/collect.vue

@@ -2,7 +2,7 @@
   <div class="resi-container">
     <el-card ref="searchCard" class="search-card">
          <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
-           <el-form-item label="所在社区" prop="orgId">
+           <el-form-item v-if="communityList.length > 0" label="所在社区" prop="orgId">
             <el-select
                   v-model.trim="fmData.orgId"
                   placeholder="所在社区"