Commits · bb9733bd6fd342453727714ae9734e72a12d1527 · lanbaoming / jiedao-api-boot-master · GitLab

20 Dec, 2024 10 commits
- Merge remote-tracking branch 'origin/release' into jd_dev · bb9733bd
  Smile authored Dec 20, 2024
```
# Conflicts:
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
```
  bb9733bd
- fix: 在pda中入仓纪录明细信息需要返回品牌名和产品名 · df0bc8d0
  yanghao authored Dec 20, 2024
  
  df0bc8d0
- 空运/海运已装单添加底色 · c964d7c8
  honghy authored Dec 20, 2024
  
  c964d7c8
- Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev · cb465d0a
  Smile authored Dec 20, 2024
  
  cb465d0a
- fix:多语言法语字典表update语句修改 · e69d7857
  Smile authored Dec 20, 2024
  
  e69d7857
- 控货详情列表 · fc6e0344
  honghy authored Dec 20, 2024
  
  fc6e0344
- Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev · c98688c7
  Smile authored Dec 20, 2024
  
  c98688c7
- fix:多语言法语字典表update语句修改 · 2c269e55
  Smile authored Dec 20, 2024
  
  2c269e55
- 复制订单时重置品牌id · 1ce554dc
  zhengyi authored Dec 20, 2024
  
  1ce554dc
- 待预装订单列表查询bug修复 · e203f205
  zhengyi authored Dec 20, 2024
  
  e203f205
19 Dec, 2024 12 commits
- 修正短信节点不能更新bug · 9ec134a4
  honghy authored Dec 19, 2024
  
  9ec134a4
- fix:app站内信多语言修改，sql文件 · fba11b8c
  Smile authored Dec 19, 2024
  
  fba11b8c
- fix:app站内信多语言修改 · 019e0676
  Smile authored Dec 19, 2024
  
  019e0676
- 短信放货成功调整，放货列表查询调整 · ea678a8b
  honghy authored Dec 19, 2024
  
  ea678a8b
- 短信节点新增备注、目的仓搜索条件 · 4ea3ef49
  honghy authored Dec 19, 2024
  
  4ea3ef49
- 控货订单有收货人时也发送短信 · e08680a1
  zhengyi authored Dec 19, 2024
  
  e08680a1
- fix:需求取消未分配客户经理异常。创建订单，客户自动迁移到待分配客户列表时，客户经理字段置空失效问题修改 · e6a292ef
  Smile authored Dec 19, 2024
  
  e6a292ef
- 订单审批动态更新bug修复 · 9f4160b1
  zhengyi authored Dec 19, 2024
  
  9f4160b1
- 订单审批动态更新bug修复 · 9bf6f6ac
  zhengyi authored Dec 19, 2024
  
  9bf6f6ac
- Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev · 919d2268
  Smile authored Dec 19, 2024
  
  919d2268
- 会员模块-积分规则订单V值积分规则重复校验新增客户方规则和是否首单规则更新。 · e9b7e996
  Smile authored Dec 19, 2024
  
  e9b7e996
- Merge branch 'release' into 'jd_dev' · 5ccd2dc9
  Administrator authored Dec 19, 2024
```
Release分支合并到jd分支20241219

See merge request !48
```
  5ccd2dc9
18 Dec, 2024 6 commits
- 打包环节订单状态设为普货，防止因设置全泡。导致订单状态为抛货状态，会按照抛货收费数据计算。影响渠道免泡重功能。 · 74ef0cae
  Smile authored Dec 18, 2024
  
  74ef0cae
- 空运分拣并发bug修复 · e5502acb
  zhengyi authored Dec 18, 2024
  
  e5502acb
- 已出货订单修改计价都需要更新应收单 · dbc058ed
  zhengyi authored Dec 18, 2024
  
  dbc058ed
- 客户详情主营类别和主营商品回显返回值格式化封装bug修复 · 454adc55
  zhengyi authored Dec 18, 2024
  
  454adc55
- 自编号提单编辑列表重新排序 · b5b46bf2
  zhengyi authored Dec 18, 2024
  
  b5b46bf2
- Merge branch 'release' into 'jd_dev' · 849457b0
  Administrator authored Dec 18, 2024
```
Release分支代码合并到jd分支20241218

See merge request !47
```
  849457b0
17 Dec, 2024 5 commits
- Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev · ab435eac
  Smile authored Dec 17, 2024
  
  ab435eac
- 创建订单，订单的发货人或收货人，无归属客户经理/无在途的待接收流程（包括分配、移交），客户自动迁移到待分配客户列表 · 234b45b7
  Smile authored Dec 17, 2024
  
  234b45b7
- 短信目的仓取值调整 · 4c8c8e1d
  honghy authored Dec 17, 2024
  
  4c8c8e1d
- Merge branch 'master-fix' · a6a2251e
  zhengyi authored Dec 17, 2024
  
  a6a2251e
- 复制订单时重置调仓id数据 · 57525462
  zhengyi authored Dec 17, 2024
  
  57525462
16 Dec, 2024 3 commits
- Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev · 4b3fe376
  Smile authored Dec 16, 2024
  
  4b3fe376
- 官网首页查询订单信息倒序排序 · 7b8cecf2
  Smile authored Dec 16, 2024
  
  7b8cecf2
- 海运已装单导出调整 · 394a0a79
  honghy authored Dec 16, 2024
  
  394a0a79
13 Dec, 2024 4 commits
- 海运/空运-出货屏蔽自编号下的所有应收已核销校验添加注释 · 0d7a2d49
  wux authored Dec 12, 2024
  
  0d7a2d49
- 1.海运/空运-出货屏蔽自编号下的所有应收已核销校验 · 8b5ce941
  honghy authored Dec 12, 2024
  
  8b5ce941
- 调整Bulk客户端接收状态 · a2ca58ab
  honghy authored Dec 13, 2024
  
  a2ca58ab
- 订单短信日志 · 062b8816
  honghy authored Dec 13, 2024
  
  062b8816