Merge branch 'master' of http://47.92.161.104:10080/shuzhan/jp-employment-portal

src/views/base/company-detail.vue

@@ -40,9 +40,9 @@
             >
               <el-option
                 v-for="scale in scaleResult"
-                :key="scale.value"
+                :key="scale.id"
                 :label="scale.name"
-                :value="scale.value"
+                :value="scale.id"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -68,9 +68,9 @@
             >
               <el-option
                 v-for="industry in industryResult"
-                :key="industry.value"
+                :key="industry.id"
                 :label="industry.name"
-                :value="industry.value"
+                :value="industry.id"
               ></el-option>
             </el-select>
           </el-form-item>

src/views/job/resume-list.vue

@@ -24,7 +24,7 @@
       </el-form-item> -->
       <el-form-item label="是否上架" prop="status">
         <el-select v-model="queryModel.status" filterable placeholder="请选择是否上架" size="mini">
-          <el-option v-for="status in statusResult" :key="status.value" :label="status.name" :value="status.id"></el-option>
+          <el-option v-for="status in statusResult" :key="status.value" :label="status.name" :value="status.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="姓名" prop="name">