Commit Graph
14 Commits
Author SHA1 Message Date
1745237360-cloud 935c154136 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
2026-01-12 14:32:37 +08:00
1745237360-cloud c8493dd658 数据权限的bug修改 2026-01-12 14:30:00 +08:00
王奎兴 c337a7ed49 委托方查询接口添加结算币种; 2026-01-10 20:39:53 +08:00
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
王奎兴 1d9629127a 结算币种修改; 2025-12-23 13:38:56 +08:00
hjx f8399951b3 Merge branch 'dev_nc2k_20251213' 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/resources/bootstrap.yml
#	mhd_finance/src/main/resources/bootstrap.yml
#	mhd_product/src/main/resources/bootstrap.yml
#	mhd_thrid_party/src/main/resources/bootstrap.yml
#	mhd_transport/src/main/resources/bootstrap.yml
2025-12-13 17:32:20 +08:00
hjx a18fd9d59b 漏洞扫描修改 2025-12-13 15:04:36 +08:00
赵辉 df299a21ae Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall 2025-12-10 09:28:06 +08:00
赵辉 7b10ff2b25 12.9修改 2025-12-10 09:21:33 +08:00
赵辉 0b361ba2b7 12.6修改 2025-12-06 20:31:05 +08:00
hjx 7efbe3d404 南歧nc65对接 2025-12-05 18:21:36 +08:00
hjx 73a2d7f1c9 南歧nc65对接 2025-12-02 20:48:25 +08:00
陈现府 8355431361 first commit 2025-11-20 10:45:16 +08:00