Merge branch 'feature/master' into feature/develop

src/views/business/production/receiveResource/form.vue

@@ -26,7 +26,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="企业名称" prop="companyId">
+              <el-form-item label="客户名称" prop="companyId">
                 <el-select v-model="form.companyId" style="width: 100%" @focus="focusCompanySelect">
                   <el-option v-for="item in companyList" :key="item.id" :label="item.name"
                     :value="item.id" />