1745237360-cloud f7e6f70321 Merge branch 'refs/heads/dev_qinhongzhan' into dev ...

# Conflicts:
#	mhd-auth/src/main/resources/bootstrap.yml
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
#	mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
#	mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java

2026-01-10 16:45:38 +08:00

..

src/main

Merge branch 'refs/heads/dev_qinhongzhan' into dev

2026-01-10 16:45:38 +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