Commit Graph
15 Commits
Author SHA1 Message Date
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
1745237360-cloud 4b427e1b2e 数据权限的修改 2026-01-10 16:39:33 +08:00
王奎兴 1259c189b0 华为云obs;结算货币; 2025-12-25 10:20:17 +08:00
王奎兴 1d9629127a 结算币种修改; 2025-12-23 13:38:56 +08:00
王奎兴 8a4423db5f 达梦适配遗漏 2025-12-08 15:02:50 +08:00
王奎兴 990f145846 达梦适配遗漏 2025-12-06 22:22:54 +08:00
王奎兴 0f8f3de71b 解决代码冲突 2025-12-06 22:17:12 +08:00
王奎兴 2a1e542704 Merge branch 'dm_20251204' into dev
# Conflicts:
#	mhd-user-center/src/main/resources/mapper/UserMapper.xml
#	mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
2025-12-06 22:15:26 +08:00
hjx 8527d24d48 南歧nc65对接修改 2025-12-06 21:57:17 +08:00
hjx 7ff3054dc9 南歧nc65对接 2025-12-06 08:58:04 +08:00
王奎兴 c8a0e27172 达梦适配修改 2025-12-05 18:21:41 +08:00
hjx 7efbe3d404 南歧nc65对接 2025-12-05 18:21:36 +08:00
王奎兴 8ea6aa7e8f 达梦适配修改 2025-12-05 16:41:05 +08:00
王奎兴 32f12bb138 达梦适配修改 2025-12-05 10:47:46 +08:00
陈现府 8355431361 first commit 2025-11-20 10:45:16 +08:00