rcx 471b515a45 Merge branch 'refs/heads/dev-ty1.2' into dev ...

# 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
#	mhd_oms/src/main/resources/bootstrap.yml

2026-09-01 23:49:08 +08:00

..

src/main

Merge branch 'refs/heads/dev-ty1.2' into dev

2026-09-01 23:49:08 +08:00

Dockerfile

arm适配

2025-12-09 16:14:22 +08:00

pom.xml

Merge branch 'dev_nc2k_20251213' into dev

2025-12-13 17:32:20 +08:00