合并订单编辑，fix合并冲突

src/api/data.js

@@ -143,3 +143,12 @@ export function getCityData(query) {
     params: query
   })
 }
+
+// 获取仓库区域并行国家、城市、仓库列表
+export function getGuojiaAndShiAndWarehouseList(query = {}) {
+  return request({
+    url: '/app-api/ecw/warehouse/getGuojiaAndShiAndWarehouseList',
+    method: 'get',
+    params: query
+  })
+}

src/lang/zh.js

@@ -568,11 +568,11 @@ export default {
     consignorPhone: '发货人电话',
     consignorEmail: '发货人邮箱',
     consigneeName: '收货人',
-    consigneeCompany: '收货人公司名称',
-    consigneeNameEn: '收货人英文名称',
-    consigneeCompanyEn: '收货人公司英文名称',
-    consigneeEmail: '收货人邮箱',
-    consigneePhone: '收货人电话',
+    consigneeCompany: '公司名称',
+    consigneeNameEn: '英文名称',
+    consigneeCompanyEn: '公司英文名称',
+    consigneeEmail: '邮箱',
+    consigneePhone: '电话',
     marks: '唛头',
     isCargoControl: '是否控货',
     baseInfo: '基础',

src/views/jiedao/profile/components/SectionTitle.vue

+<script>
+export default {
+  props: {
+    title: String,
+    langKey: String
+  }
+}
+</script>
+
+<template>
+  <div style="display: flex">
+    <div
+        style="
+                width: 6px;
+                height: 26px;
+                background: #659fd5;
+                border-radius: 0px 6px 6px 0px;
+              "
+    />
+    <span
+        style="
+                font-size: 22px;
+                font-weight: 500;
+                color: #333;
+                line-height: 26px;
+                margin-left: 5px;
+              "
+    >
+      <slot>{{ title || $t(langKey) }}</slot>
+    </span>
+  </div>
+</template>
+
+<style scoped>
+
+</style>