Commit Graph
82 Commits
Author SHA1 Message Date
王奎兴 240e18d81e Merge branch 'wms_dev' into dev 2026-02-12 10:10:49 +08:00
秦鸿展 308f79b804 任务BUG修改 2026-02-09 16:53:46 +08:00
王奎兴 5d89fdc0a6 Merge branch 'wms_dev' into wms_dev_hbbf
# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd_oms/pom.xml
2026-02-09 14:29:47 +08:00
秦鸿展 244b8d7e6e 基础数据的BUG修改 2026-02-07 17:22:11 +08:00
赵辉 fa68e9dc0e 修改密码修正 2026-02-06 18:50:13 +08:00
zhou-hongcheng 5acc1059c1 货主管理查询条件优化 2026-02-06 11:12:39 +08:00
zhou-hongcheng da439c9127 任务下发选择用户只显示当前用户登录的仓库已经绑定的账号 2026-02-05 10:33:36 +08:00
zhou-hongcheng 0194adc794 修改密码后不能用新密码登录bug 2026-02-03 14:30:54 +08:00
赵辉 e26dc853d5 oms发单 2026-01-28 13:20:09 +08:00
王奎兴 76fff6437d 出库流程操作库存;出库单导入调整; 2026-01-27 17:23:06 +08:00
zhou-hongcheng a51e6e3f3d 配置 2026-01-23 15:30:46 +08:00
zhou-hongcheng 7802b28143 新增货主后列表不展示bug修改 2026-01-23 15:30:01 +08:00
zhou-hongcheng 9e8f0f195a 货主管理新增字段 补充备注 2026-01-21 16:54:26 +08:00
zhou-hongcheng fe174b45ef 货主管理新增字段 2026-01-20 16:09:23 +08:00
秦鸿展 7f8732dd02 选择车队不一致修改 2026-01-19 15:32:00 +08:00
王奎兴 f6231256d5 配置文件; 2026-01-15 14:31:31 +08:00
王奎兴 52f5b6e0d6 Merge branch 'refs/heads/test' 2026-01-15 07:56:41 +08:00
hjx 015162d5c9 Merge branch 'dev' into master
# Conflicts:
#	mhd-auth/src/main/resources/bootstrap.yml
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-user-center/src/main/resources/bootstrap.yml
#	mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
2026-01-15 03:36:33 +08:00
王奎兴 4bde2aee3d 配置文件 2026-01-14 23:30:43 +08:00
王奎兴 9996f59fe4 角色管理查询不过滤RoleGrade 2026-01-14 23:25:17 +08:00
王奎兴 e5f8ddd8b6 配置文件修改; 2026-01-14 22:31:02 +08:00
王奎兴 8d89f5ec27 应收账单结算页面结算币种 2026-01-14 16:46:00 +08:00
王奎兴 84ab2c8bf9 Merge remote-tracking branch 'refs/remotes/origin/dev' into test
# Conflicts:
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
2026-01-14 16:40:52 +08:00
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
hjx af7dda73de Merge branch 'dev' into master
# 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
2026-01-07 15:04:36 +08:00
王奎兴 8b98c54d11 Revert "回复大小写敏感;"
This reverts commit 6cb96410a2.
2026-01-05 15:50:23 +08:00
王奎兴 fd579a6f42 nacos配置; 2026-01-05 13:17:16 +08:00
王奎兴 f14547eb53 nacos配置; 2026-01-05 08:42:07 +08:00
王奎兴 6cb96410a2 回复大小写敏感; 2025-12-31 14:05:07 +08:00
王奎兴 2ddb557bcc nacos修改; 2025-12-30 14:41:03 +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