Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/pro/productionSolution/components/ProogingProcess.vue

@@ -5,7 +5,7 @@
       <el-table-column label="工序名称" prop="processName" align="center" />
       <el-table-column label="工作中心" prop="workstationName" align="center" />
       <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
-      <el-table-column label="换形时间" prop="lineBreakTime" align="center" />
+      <el-table-column label="换型时间" prop="lineBreakTime" align="center" />
       <el-table-column
         label="工时单位"
         prop="stdWorkingTimeUom"