Merge branch 'master' of ssh://git.7in6.com:11022/dacheng/mes-dacheng-admin-backend-ui

src/view/inventory/ruku.vue

@@ -182,7 +182,7 @@
 				  <el-table-column align="left" sortable label="订单编号" prop="订单编号"  width="140"/>
 				  <el-table-column align="left" sortable label="款号" prop="款号"  width="180"/>
 				  <el-table-column align="left" sortable label="数量" prop="数量"  width="105"/>
-                  <el-table-column align="left" sortable label="出库时间" prop="出库时间"  width="160"/>
+                  <el-table-column align="left" sortable label="退还时间" prop="退还时间"  width="160"/>
                   <el-table-column align="left" sortable label="退还机台" prop="退还机台"  width="160"/>
                 </el-table>
               </el-tab-pane>