Commit Graph
54 Commits
Author SHA1 Message Date
1745237360-cloud 035593b419 数据权限的bug修改260113 2026-01-13 11:32:57 +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
王奎兴 f14547eb53 nacos配置; 2026-01-05 08:42:07 +08:00
王奎兴 40744bb5c1 开通钱包失败取消 2025-12-30 10:54:16 +08:00
hjx 5aa70ed41b 正式环境配置 2025-12-25 16:03:30 +08:00
王奎兴 1259c189b0 华为云obs;结算货币; 2025-12-25 10:20:17 +08:00
王奎兴 1d9629127a 结算币种修改; 2025-12-23 13:38:56 +08:00
hjx 2c0882ae2d 问题修改 2025-12-17 19:03:43 +08:00
hjx e3f242f97b 问题修改 2025-12-17 18:41:12 +08:00
hjx bcabed521d 问题修改 2025-12-17 18:02:55 +08:00
王奎兴 2199c8c739 获取网络货运司机id 2025-12-17 17:45:54 +08:00
赵辉 2b3fa73db1 Merge branch 'refs/heads/nanguangmall' into dev 2025-12-16 17:08:56 +08:00
赵辉 c78b9c325c userDriver类中添加车辆主体 2025-12-16 17:02:34 +08:00
王奎兴 6c2fb7c013 bug 2025-12-15 22:15:42 +08:00
赵辉 5cc3b9a62f Merge branch 'refs/heads/nanguangmall' into dev 2025-12-15 17:16:34 +08:00
赵辉 21157b70ed 添加根据用户id查询企业信息 2025-12-15 17:15:16 +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
王奎兴 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
王奎兴 74e735353f 本地开发分支配置文件修改 2025-12-12 10:16:50 +08:00
hjx c6709936f9 配置文件修改 2025-12-10 14:24:02 +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
hjx 083e5fc145 arm适配 2025-12-10 01:35:21 +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
王奎兴 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
王奎兴 5b2212d5db 达梦适配修改 2025-12-06 20:34:00 +08:00
王奎兴 ee9935b5c3 达梦适配修改 2025-12-06 09:12:39 +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
hjx 7efbe3d404 南歧nc65对接 2025-12-05 18:21:36 +08:00
王奎兴 8ea6aa7e8f 达梦适配修改 2025-12-05 16:41:05 +08:00