Commit Graph
45 Commits
Author SHA1 Message Date
王奎兴 f6231256d5 配置文件; 2026-01-15 14:31:31 +08:00
王奎兴 e5f8ddd8b6 配置文件修改; 2026-01-14 22:31:02 +08:00
王奎兴 8d89f5ec27 应收账单结算页面结算币种 2026-01-14 16:46:00 +08:00
高正杨 64d2a5e001 发单报found2; 2026-01-14 09:46:37 +08:00
赵辉 d2e8d6ab30 Merge branch 'refs/heads/dev_zh_ty_20260108' into dev 2026-01-12 13:54:15 +08:00
赵辉 540a687f7e 修改副驾绑定 2026-01-12 13:53:01 +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
王奎兴 0db01980b8 物料不选货主也可更新; 2026-01-06 17:48:12 +08:00
王奎兴 f14547eb53 nacos配置; 2026-01-05 08:42:07 +08:00
王奎兴 29b24e8450 nacos修改; 2025-12-30 13:50:37 +08:00
王奎兴 d9113d0523 货主不为空取消 2025-12-29 19:02:13 +08:00
王奎兴 4a7d28350e Revert "恢复大小写"
This reverts commit 52cdfbe6d9.
2025-12-14 15:12:59 +08:00
王奎兴 52cdfbe6d9 恢复大小写 2025-12-14 14:29:16 +08:00
赵辉 2b385f45cd Merge branch 'refs/heads/nanguangmall' into dev 2025-12-13 23:07:56 +08:00
赵辉 51b5ae5d13 12.13修改 2025-12-13 23:06:31 +08:00
王奎兴 927b5a4411 Merge remote-tracking branch 'origin/dev_wkx_20251209' into dev 2025-12-13 22:59:55 +08:00
王奎兴 0beab25b52 bug修复; 2025-12-13 22:59:26 +08:00
王奎兴 c830009948 Merge remote-tracking branch 'origin/dev_wkx_20251209' into dev 2025-12-13 22:06:34 +08:00
王奎兴 97330de8ba bug修复; 2025-12-13 20:48:24 +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
王奎兴 74e735353f 本地开发分支配置文件修改 2025-12-12 10:16:50 +08:00
王奎兴 afc49be45f 订单发货校验去除; 2025-12-12 10:16:18 +08:00
hjx 3d4df0a154 Merge branch 'dev_minio_20251210' into master 2025-12-11 12:38:42 +08:00
hjx 71fbf2ad1b minio对接 2025-12-10 22:31:22 +08:00
hjx d58b948c3a 配置文件修改 2025-12-10 15:05:19 +08:00
hjx 3f2ac515d5 nacos配置文件修改 2025-12-10 10:48:38 +08:00
赵辉 df299a21ae Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall 2025-12-10 09:28:06 +08:00
hjx 1b8a0eb8a4 Merge branch 'dev_arm_251208' into dev 2025-12-10 09:14:07 +08:00
王奎兴 4ca5121856 Merge branch 'dm_20251204' into dev 2025-12-09 19:14:42 +08:00
王奎兴 ab1472ff50 达梦适配大小写敏感 2025-12-09 18:43:00 +08:00
hjx 9153b6a498 arm适配 2025-12-09 16:14:22 +08:00
hjx f63a48783e arm适配 2025-12-09 11:54:45 +08:00
LAPTOP-DREK3SC6\86186 c58b3cc689 arm适配 2025-12-08 23:46:19 +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
赵辉 0b361ba2b7 12.6修改 2025-12-06 20:31:05 +08:00
hjx 7ff3054dc9 南歧nc65对接 2025-12-06 08:58:04 +08:00
赵辉 a950417939 12.5修改 2025-12-05 21:42:06 +08:00
王奎兴 c8a0e27172 达梦适配修改 2025-12-05 18:21:41 +08:00
王奎兴 8ea6aa7e8f 达梦适配修改 2025-12-05 16:41:05 +08:00
王奎兴 32f12bb138 达梦适配修改 2025-12-05 10:47:46 +08:00
陈现府 5005f4291f 添加线上环境配置 2025-11-22 17:54:14 +08:00
陈现府 8355431361 first commit 2025-11-20 10:45:16 +08:00