王奎兴 206c85aaf7 Merge branch 'dev_20260429' into dev_WMS20260401 ...

# Conflicts:
#	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/UserServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batchDetail/BatchDetailApplicationService.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/service/BatchDetailDomainService.java
#	mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/sysTableConfig/SysTableConfigApi.java

2026-05-15 13:55:42 +08:00

..

src/main

Merge branch 'dev_20260429' into dev_WMS20260401

2026-05-15 13:55:42 +08:00

Dockerfile

docker配置修改;

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

pom.xml

Merge branch 'wms_dev' into wms_dev_hbbf

2026-02-09 14:29:47 +08:00