Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop

谭毅彬
2 parents ef3bdc6a 2123e71a
Showing 4 changed files with 4 additions and 4 deletions
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
@@ -289,7 +289,7 @@ export default {
           dataIndex: 'updateTime'
         },
         {
-          title: '执行时间',
+          title: '下发时间',
           align: "center",
           dataIndex: 'executeTime'
         },
@@ -285,7 +285,7 @@ export default {
           dataIndex: 'updateTime'
         },
         {
-          title: '执行时间',
+          title: '下发时间',
           align: "center",
           dataIndex: 'executeTime'
         },
@@ -285,7 +285,7 @@ export default {
           dataIndex: 'updateTime'
         },
         {
-          title: '执行时间',
+          title: '下发时间',
           align: "center",
           dataIndex: 'executeTime'
         },
@@ -292,7 +292,7 @@ export default {
           dataIndex: 'updateTime'
         },
         {
-          title: '执行时间',
+          title: '下发时间',
           align: "center",
           dataIndex: 'executeTime'
         },