Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/work/process/index.vue
#	src/views/work/record/index.vue

src/views/work/record/index.vue

@@ -54,7 +54,7 @@
     <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="钽靶编号" align="center" prop="id" />
+      <el-table-column label="物料id" align="center" prop="materialId" />
       <el-table-column label="状态">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.state===0" type="info">未开始</el-tag>
@@ -70,6 +70,7 @@
       <el-table-column label="厚度" align="center" prop="width" />
       <el-table-column label="最终厚度" align="center" prop="finalWidth" />
       <el-table-column label="最终直径" align="center" prop="finalDiameter" />
+      <el-table-column label="轧制人员" align="center" prop="updateBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button