Merge branch 'mk' into 周五演示分支

# Conflicts:
#	src/views/components/resiSearch.vue

src/views/components/resiSearch.vue

@@ -90,6 +90,14 @@
           <el-input v-model="form[item.value]" class="u-item-width-service" placeholder="请输入" clearable size="small">
           </el-input>
         </el-form-item>
+        <el-form-item label="身份">
+          <el-select v-model="form.identity" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in projectStaffList">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
+
+          </el-select>
+        </el-form-item>
         <el-form-item label="居民年龄">
           <el-input v-model="form.ageStart" @change="handleAgeChange" class="u-item-width-daterange" placeholder="请输入" clearable size="small">
           </el-input>