Merge branch 'mk' into preview

src/views/components/resiSearch.vue

@@ -98,7 +98,7 @@
           </el-input>
         </el-form-item>
         <el-form-item label="身份">
-          <el-select v-model="form.projectStaff" class="u-item-width-normal" clearable size="small">
+          <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>