weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20260429' into dev_WMS20260401

Browse Source 
# Conflicts:
#	mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java
#	mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
This commit is contained in:
王奎兴
2026-05-21 16:14:56 +08:00
parent e782cd05d1 57d5043ac2
commit dc26614e68
41 changed files with 577 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/resources/bootstrap.yml
+2 -2
View File
@@ -16,7 +16,7 @@ spring:
# server-addr: 127.0.0.1:8848
# server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
server-addr: 10.102.192.5:6848
server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
#线上正式环境
@@ -25,7 +25,7 @@ spring:
# server-addr: 127.0.0.1:8848
# server-addr: 10.33.0.129:6010
# 线上测试环境配置 容器名+端口号
server-addr: 10.102.192.5:6848
server-addr: 10.102.192.31:6848
username: nacos
password: manhuoda@2023
#线上正式环境