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

Merge branch 'wms_dev' into wms_dev_hbbf

Browse Source 
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd_oms/pom.xml
This commit is contained in:
王奎兴
2026-02-09 14:29:47 +08:00
parent fa68e9dc0e 9cdb5a8896
commit 5d89fdc0a6
228 changed files with 17780 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/resources/bootstrap.yml
+4 -2
View File
@@ -25,7 +25,8 @@ spring:
# username: nacos
# password: manhuoda@2023
#线上正式环境
server-addr: 10.102.192.5:6848
server-addr: 127.0.0.1:8848
# server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
#线上正式环境
@@ -39,7 +40,8 @@ spring:
# username: nacos
# password: manhuoda@2023
#线上正式环境
server-addr: 10.102.192.5:6848
server-addr: 127.0.0.1:8848
# server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
#线上正式环境