王奎兴 ec5afcc5bd Merge branch 'dev-ty1.2' into test ...

# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java
#	mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java
#	mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java

2026-09-14 14:43:19 +08:00

..

src/main

Merge branch 'dev-ty1.2' into test

2026-09-14 14:43:19 +08:00

Dockerfile

docker配置修改;

2026-04-20 13:44:56 +08:00

pom.xml

bms改造;

2026-09-01 16:58:39 +08:00