 王奎兴
|
dd4fc13adc
|
Merge branch 'dev' into dev_WMS20260401
# Conflicts:
# mhd-user-center/src/main/resources/bootstrap.yml
# mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java
# mhd_oms/src/main/resources/bootstrap.yml
# mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
|
2026-06-16 11:11:48 +08:00 |
|
 秦鸿展
|
8e0b728206
|
客商主数据同步修改BUG
|
2026-06-12 16:56:11 +08:00 |
|
 zhaoqing
|
04d24f1c11
|
修改商业合作伙伴推送-各组织独立问题
|
2026-06-11 20:40:50 +08:00 |
|
|
zhaoqing
|
e81a1fda06
|
修改商业合作伙伴推送-各组织独立问题
|
2026-06-11 15:29:52 +08:00 |
|
 赵辉
|
c21ebcdc1b
|
承运人添加车辆bug
|
2026-06-11 11:30:24 +08:00 |
|
|
zhaoqing
|
0c69a6ef36
|
修改商业合作伙伴推送-各组织独立问题
|
2026-06-11 11:22:43 +08:00 |
|
|
秦鸿展
|
b5f5f27b84
|
同步客商数据BUG修改
|
2026-06-11 10:46:33 +08:00 |
|
|
秦鸿展
|
c59fa363ee
|
客商委托方数据同步
|
2026-06-08 15:05:34 +08:00 |
|
 zhaoqing
|
047335ccbb
|
查询客户nc编码
|
2026-06-02 11:42:35 +08:00 |
|
|
王奎兴
|
c7cb8614ef
|
日期时区问题修改;
|
2026-05-28 21:21:51 +08:00 |
|
|
王奎兴
|
39503f9f3c
|
日期时区问题修改;
|
2026-05-28 21:20:07 +08:00 |
|
|
秦鸿展
|
1679403f56
|
客户修改和删除BUG修改
|
2026-05-27 14:08:36 +08:00 |
|
|
赵辉
|
dbb1cace5b
|
新增委托方修改
|
2026-05-22 11:02:18 +08:00 |
|
|
赵辉
|
591cfa57d1
|
新增承运人修改
|
2026-05-22 09:43:18 +08:00 |
|
|
王奎兴
|
dc26614e68
|
Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts:
# mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java
# mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java
|
2026-05-21 16:14:56 +08:00 |
|
|
赵辉
|
4f03f56126
|
组织排队开关，新增用户司机同步yms，oms预约单修改
|
2026-05-21 15:15:49 +08:00 |
|
|
王奎兴
|
206c85aaf7
|
Merge branch 'dev_20260429' into dev_WMS20260401
# Conflicts:
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
# mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batchDetail/BatchDetailApplicationService.java
# mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/service/BatchDetailDomainService.java
# mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/sysTableConfig/SysTableConfigApi.java
|
2026-05-15 13:55:42 +08:00 |
|
|
zhaoqing
|
e8dfcd723f
|
商业合作伙伴推送人姓名字段添加
|
2026-05-14 11:31:26 +08:00 |
|
|
zhaoqing
|
5958db4fc2
|
oms-合作伙伴查询参数添加
|
2026-05-12 09:46:43 +08:00 |
|
|
zhaoqing
|
424621143d
|
物料管理 查询添加条件 oms-gw推送-物料管理 推送更新状态
|
2026-05-09 19:33:36 +08:00 |
|
|
zhaoqing
|
e5b836012b
|
OMS-GW推送-商业合作伙伴
|
2026-05-06 16:05:38 +08:00 |
|
|
zhaoqing
|
2973c0c4b1
|
OMS-GW推送-商业合作伙伴-user_center
|
2026-04-30 16:38:29 +08:00 |
|
 zhou-hongcheng
|
3a7d3c0532
|
路线管理列表
|
2026-04-27 13:40:30 +08:00 |
|
|
王奎兴
|
3062adeca9
|
部门id改为字符串;
|
2026-04-21 19:27:45 +08:00 |
|
|
zhou-hongcheng
|
742ef6ac1f
|
委托方查询sql
|
2026-03-17 17:53:13 +08:00 |
|
|
zhou-hongcheng
|
86a2151330
|
托运方管理新增字段
|
2026-03-17 15:48:09 +08:00 |
|
|
zhou-hongcheng
|
f637ec6f93
|
托运方管理新增字段
|
2026-03-17 11:08:28 +08:00 |
|
|
秦鸿展
|
308f79b804
|
任务BUG修改
|
2026-02-09 16:53:46 +08:00 |
|
|
王奎兴
|
76fff6437d
|
出库流程操作库存;出库单导入调整;
|
2026-01-27 17:23:06 +08:00 |
|
|
zhou-hongcheng
|
9e8f0f195a
|
货主管理新增字段 补充备注
|
2026-01-21 16:54:26 +08:00 |
|
|
zhou-hongcheng
|
fe174b45ef
|
货主管理新增字段
|
2026-01-20 16:09:23 +08:00 |
|
 1745237360-cloud
|
035593b419
|
数据权限的bug修改260113
|
2026-01-13 11:32:57 +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 |
|
|
王奎兴
|
1259c189b0
|
华为云obs;结算货币;
|
2025-12-25 10:20:17 +08:00 |
|
|
王奎兴
|
1d9629127a
|
结算币种修改;
|
2025-12-23 13:38:56 +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 |
|
|
赵辉
|
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 |
|
|
赵辉
|
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 |
|
|
王奎兴
|
97330de8ba
|
bug修复;
|
2025-12-13 20:48:24 +08:00 |
|
|
赵辉
|
df299a21ae
|
Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall
|
2025-12-10 09:28:06 +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 |
|
|
王奎兴
|
ee9935b5c3
|
达梦适配修改
|
2025-12-06 09:12:39 +08:00 |
|
|
赵辉
|
a950417939
|
12.5修改
|
2025-12-05 21:42:06 +08:00 |
|
|
hjx
|
7efbe3d404
|
南歧nc65对接
|
2025-12-05 18:21:36 +08:00 |
|
|
王奎兴
|
8ea6aa7e8f
|
达梦适配修改
|
2025-12-05 16:41:05 +08:00 |
|