Merge branch 'feature/master' into feature/develop

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

@@ -9,8 +9,8 @@
         <el-input v-model.trim="queryParams.fileName" size="small" type="text" placeholder="文件名称" :clearable="true"
           style="width: 130px" />
       </el-form-item>
-      <el-form-item label="企业名称：">
-        <el-input v-model.trim="queryParams.companyName" size="small" type="text" placeholder="企业名称" :clearable="true"
+      <el-form-item label="客户名称：">
+        <el-input v-model.trim="queryParams.companyName" size="small" type="text" placeholder="客户名称" :clearable="true"
           style="width: 130px" />
       </el-form-item>
       <el-form-item label="文件类型：">