diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml
index d2ad81e8f..2afad33b3 100644
--- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml
+++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml
@@ -14,20 +14,20 @@ spring:
nacos:
discovery:
# server-addr: 127.0.0.1:8848
-# server-addr: 10.33.0.129:6010
+ server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
- server-addr: 10.102.192.5:6848
- username: nacos
- password: manhuoda@2023
+# server-addr: 10.102.192.5:6848
+# username: nacos
+# password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
config:
# server-addr: 127.0.0.1:8848
-# server-addr: 10.33.0.129:6010
+ server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
- server-addr: 10.102.192.5:6848
- username: nacos
- password: manhuoda@2023
+# server-addr: 10.102.192.5:6848
+# username: nacos
+# password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml
index ca12007b7..90cf188c9 100644
--- a/mhd-user-center/src/main/resources/bootstrap.yml
+++ b/mhd-user-center/src/main/resources/bootstrap.yml
@@ -20,17 +20,17 @@ spring:
discovery:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
-# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.5:6848
- username: nacos
- password: manhuoda@2023
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.5:6848
+# username: nacos
+# password: manhuoda@2023
config:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
-# server-addr: 10.33.0.129:6010
- server-addr: 10.102.192.5:6848
- username: nacos
- password: manhuoda@2023
+ server-addr: 10.33.0.129:6010
+# server-addr: 10.102.192.5:6848
+# username: nacos
+# password: manhuoda@2023
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml
index d791822d4..b1f7e7648 100644
--- a/mhd_oms/src/main/resources/bootstrap.yml
+++ b/mhd_oms/src/main/resources/bootstrap.yml
@@ -16,39 +16,22 @@ spring:
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8848
- username: nacos
- password: manhuoda@2023
- # 演示环境
- # server-addr: 47.92.229.169:8848
- # 测试开发环境
-# server-addr: 192.168.10.18:8848
- # Saas环境
- # server-addr: 8.130.64.92:8848
- # ip: 118.25.4.55
- # 大运通泰生产环境
-# server-addr: 39.107.137.158:8848
- # 线上测试环境
-# server-addr: 116.204.23.92:8848
+ # server-addr: 127.0.0.1:8848
+ server-addr: 10.33.0.129:6010
+ # 线上测试环境配置 容器名+端口号
+ # server-addr: 10.102.192.5:6848
+ # username: nacos
+ # password: manhuoda@2023
+ #线上正式环境
+ # server-addr: 10.102.192.105:6848
config:
- # 配置中心地址
- server-addr: 127.0.0.1:8848
- username: nacos
- password: manhuoda@2023
- # 演示环境
- # server-addr: 47.92.229.169:8848
- # 测试开发环境
-# server-addr: 192.168.10.18:8848
- # Saas环境
- # server-addr: 8.130.64.92:8848
- # 大运通泰生产环境
-# server-addr: 39.107.137.158:8848
- # 线上测试环境
-# server-addr: 116.204.23.92:8848
+ # server-addr: 127.0.0.1:8848
+ server-addr: 10.33.0.129:6010
+ # 线上测试环境配置 容器名+端口号
+ # server-addr: 10.102.192.5:6848
+ # username: nacos
+ # password: manhuoda@2023
# 锁定server端的配置文件(读取它的配置项)
namespace: # 命名空间id
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置
- file-extension: yml #默认properties
-
-
-
+ file-extension: yml #默认properties
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index 7c60a377a..36d98e251 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -88,6 +88,9 @@
+
+
+
@@ -123,6 +126,7 @@
a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT,
a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.reservation_audit_time,a.reservation_audit_name
,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.RESERVATION_ORDER_SOURCE,a.tms_order_number
+ ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index 82203478b..4743a1c8d 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -89,6 +89,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
@@ -105,7 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE,
a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.reservation_audit_time,a.reservation_audit_name
- ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number
+ ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number,
+ a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID
diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml
index 02b11d559..441f84b40 100644
--- a/mhd_wms/src/main/resources/bootstrap.yml
+++ b/mhd_wms/src/main/resources/bootstrap.yml
@@ -14,24 +14,24 @@ spring:
nacos:
discovery:
# server-addr: 127.0.0.1:8848
- # server-addr: 10.33.0.129:6010
+ server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
- server-addr: 10.102.192.5:6848
- username: nacos
- password: manhuoda@2023
+# server-addr: 10.102.192.5:6848
+# username: nacos
+# password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
config:
# server-addr: 127.0.0.1:8848
- # server-addr: 10.33.0.129:6010
+ server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
- server-addr: 10.102.192.5:6848
- username: nacos
- password: manhuoda@2023
+# server-addr: 10.102.192.5:6848
+# username: nacos
+# password: manhuoda@2023
#线上正式环境
# server-addr: 10.102.192.105:6848
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
\ No newline at end of file