合并解决冲突

package.json

@@ -20,6 +20,7 @@
     "clipboard": "2.0.4",
     "codemirror": "5.45.0",
     "core-js": "3.6.5",
+    "decimal.js": "^10.4.3",
     "driver.js": "0.9.5",
     "dropzone": "5.5.1",
     "echarts": "4.2.1",

src/lang/en.js

@@ -592,7 +592,7 @@ export default {
     marks: 'marks',
     isCargoControl: 'Is cargo on hold',
     baseInfo: 'baseInfo',
-    transportInfo: 'transportInfo',
+    transportInfo: 'transport',
     costVO: 'orderInfo',
     box: 'CTNS',
     is: 'yes',

src/lang/zh.js

@@ -575,8 +575,8 @@ export default {
     consigneePhone: '收货人电话',
     marks: '唛头',
     isCargoControl: '是否控货',
-    baseInfo: '基础信息',
-    transportInfo: '物流信息',
+    baseInfo: '基础',
+    transportInfo: '运输',
     costVO: '填单信息',
     box: '箱',
     is: '是',