Commits · 9ba3d0a1cbbb93c0f4294914b74e1ec7b29ce15a · lanbaoming / jiedao-api-boot-master

25 Dec, 2024 1 commit
- 会员等级修改 · 9ba3d0a1
  Smile authored Dec 25, 2024
  
  9ba3d0a1
24 Dec, 2024 14 commits
- 订单明细多语言 · 00497c42
  honghy authored Dec 24, 2024
  
  00497c42
- Merge remote-tracking branch 'origin/jd_dev' into jd_dev · 1993a145
  honghy authored Dec 24, 2024
  
  1993a145
- 短信验证码多语言 · 56434bce
  honghy authored Dec 24, 2024
  
  56434bce
- 修改sql脚本的注释 · 4080abac
  wux authored Dec 24, 2024
  
  4080abac
- 修改sql脚本的注释 · ac614de7
  wux authored Dec 24, 2024
  
  ac614de7
- Merge remote-tracking branch 'origin/jd_dev' into jd_dev · 6f507e89
  Smile authored Dec 24, 2024
  
  6f507e89
- sql修改 · b3246953
  Smile authored Dec 24, 2024
  
  b3246953
- 节点、模板、渠道sql · 75d1f9e4
  honghy authored Dec 24, 2024
  
  75d1f9e4
- Merge branch 'release' into 'jd_dev' · 5eb759c9
  Administrator authored Dec 24, 2024
```
Release分支代码合并到jd分支

See merge request !55
```
  5eb759c9
- Merge remote-tracking branch 'origin/release' into release · b7615bb7
  wux authored Dec 24, 2024
  
  b7615bb7
- 将jd_dev分支代码合并到release分支 · f132dd89
  wux authored Dec 24, 2024
  
  f132dd89
- 货柜相关审批冗余到订单的审批类型bug修复 · ec5f67e8
  zhengyi authored Dec 24, 2024
  
  ec5f67e8
- bug修复 · e52e7563
  zhengyi authored Dec 24, 2024
  
  e52e7563
- Merge branch 'release' into 'jd_dev' · ac35445a
  Administrator authored Dec 24, 2024
```
Release代码合并到jd分支20241224

See merge request !54
```
  ac35445a
23 Dec, 2024 9 commits
- 协议多国语 · 472125ca
  honghy authored Dec 23, 2024
  
  472125ca
- 【(历史bug)后台-客户端公告】新增/修改 · 6ef445ce
  honghy authored Dec 23, 2024
  
  6ef445ce
- 批量审批不通过操作bug修复 · 437b6337
  zhengyi authored Dec 23, 2024
  
  437b6337
- 订单的出货审批状态更新bug修复 · 869e1a6a
  zhengyi authored Dec 23, 2024
  
  869e1a6a
- 出货阶段的订单信息修改都不对订单产品价格进行重置计算 · c16a8845
  zhengyi authored Dec 23, 2024
  
  c16a8845
- 海运空运导出装柜颜色调整 · 7f97424c
  honghy authored Dec 23, 2024
  
  7f97424c
- 收货人为空时合单与拆单bug修复 · 2031c168
  zhengyi authored Dec 23, 2024
  
  2031c168
- Merge branch 'jd_dev' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into jd_dev · a3acd705
  Smile authored Dec 23, 2024
  
  a3acd705
- fix：app法语数据库sql维护 · 49a083e1
  Smile authored Dec 23, 2024
  
  49a083e1
21 Dec, 2024 7 commits
- 控货详情列表提单号查询调整 · 3cc04422
  honghy authored Dec 21, 2024
  
  3cc04422
- 控货详情收货人查询调整 · 64a04cfd
  honghy authored Dec 21, 2024
  
  64a04cfd
- 控货详情收货人查询调整 · c29db821
  honghy authored Dec 21, 2024
  
  c29db821
- Merge remote-tracking branch 'origin/jd_dev' into jd_dev · 4e67e336
  Smile authored Dec 21, 2024
  
  4e67e336
- fix:重复请求时，返回对应的多语言提示内容 · 8dbd59b5
  Smile authored Dec 21, 2024
  
  8dbd59b5
- 控货详情列表调整 · 1a54235e
  honghy authored Dec 21, 2024
  
  1a54235e
- 空运渠道免泡重判断方式修改，泡重重量与渠道免泡重量比较，改为泡重重量-实际重量与渠道免泡重量比较 · 92aba2ff
  Smile authored Dec 21, 2024
  
  92aba2ff
20 Dec, 2024 9 commits
- mearge代码以及短信修改 · 4bac6a65
  Smile authored Dec 20, 2024
  
  4bac6a65
- 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