Commits · da840ead8108754ec99a59dd1a0ef4a6f71c7661 · lanbaoming / jiedao-api-boot-master

01 Nov, 2024 12 commits
- Merge branch 'test' into release · da840ead
  zhengyi authored Nov 01, 2024
  
  da840ead
- Merge branch 'dev' into test · 7f448c1e
  zhengyi authored Nov 01, 2024
  
  7f448c1e
- sql修复 · c155025f
  zhengyi authored Nov 01, 2024
  
  c155025f
- Merge branch 'test' into release · 4a9a0c20
  yanghao authored Nov 01, 2024
  
  4a9a0c20
- Merge branch 'dev' into test · f2d5460f
  yanghao authored Nov 01, 2024
  
  f2d5460f
- fix: #826 【客户】合并客户，被合并客户-非主客户联系人未显示 · da8687fb
  yanghao authored Nov 01, 2024
  
  da8687fb
- chore: 跟进编码生成bug修复 · ee367a23
  yanghao authored Nov 01, 2024
  
  ee367a23
- chore: 跟进编码生成bug修复 · d91b42de
  yanghao authored Nov 01, 2024
  
  d91b42de
- chore: 跟进编码生成bug修复 · a54e1b3e
  yanghao authored Nov 01, 2024
  
  a54e1b3e
- chore: 跟进编码生成bug修复 · 5d2c6f44
  yanghao authored Nov 01, 2024
  
  5d2c6f44
- chore: 跟进编码生成bug修复 · 6df275ea
  yanghao authored Nov 01, 2024
  
  6df275ea
- chore: 跟进编码生成bug修复 · c653c100
  yanghao authored Nov 01, 2024
  
  c653c100
31 Oct, 2024 13 commits
- 补充提交 · 255c39ba
  zhengyi authored Oct 31, 2024
  
  255c39ba
- 预装、分拣只排除特价与费用申请审批进行中的订单 · 06684a34
  zhengyi authored Oct 31, 2024
  
  06684a34
- 校验订单审批是否存在互斥类型接口方法名称修改 · ee61b999
  zhengyi authored Oct 31, 2024
  
  ee61b999
- sql修正 · 0b1a937f
  zhengyi authored Oct 31, 2024
  
  0b1a937f
- sql修正 · 6e743dd5
  zhengyi authored Oct 31, 2024
  
  6e743dd5
- 校验审批类型是否互斥监听器修正 · ce78508d
  zhengyi authored Oct 31, 2024
  
  ce78508d
- 完善订单并行审批任务的审批类型状态替换更新 · 037d14f4
  zhengyi authored Oct 31, 2024
  
  037d14f4
- Merge branch 'master-fix' into release · 97d12a98
  yanghao authored Oct 31, 2024
  
  97d12a98
- fix: #624 A2404786GA 麻烦看下这个单，先进仓0.3KG，申请减免泡重，按1KG收取，再进仓0.95KG，没有产生泡重异常，且整个订单都是按1KG收费 · 07c2dc59
  yanghao authored Oct 31, 2024
  
  07c2dc59
- 对订单相关审批互斥拦截业务调用 · 7eb461fe
  332784038@qq.com authored Oct 31, 2024
  
  7eb461fe
- 校验订单审批业务互斥逻辑业务提供前端校验接口 · 9a1b39fb
  332784038@qq.com authored Oct 31, 2024
  
  9a1b39fb
- 校验订单审批业务互斥逻辑 · 53b1aa90
  332784038@qq.com authored Oct 31, 2024
  
  53b1aa90
- 空运订单预装理货阶段不让编辑 · 05ecb0da
  332784038@qq.com authored Oct 31, 2024
  
  05ecb0da
30 Oct, 2024 13 commits
- 订单撤销到仓时情况订单项中的到仓数据 · bbde3d85
  zhengyi authored Oct 30, 2024
  
  bbde3d85
- 订单详情的到仓详情补充完善 · f9c0e845
  zhengyi authored Oct 30, 2024
  
  f9c0e845
- 强制到仓和一键到仓业务一致 · f309519c
  zhengyi authored Oct 30, 2024
  
  f309519c
- 删除无用代码 · 8cf1d723
  zhengyi authored Oct 30, 2024
  
  8cf1d723
- 到仓数据值冗余到订单项的bug修复 · bacd454f
  zhengyi authored Oct 30, 2024
  
  bacd454f
- 到仓记录查询业务调整 · 872c6f75
  zhengyi authored Oct 30, 2024
  
  872c6f75
- 订单模块接口文档错误修复 · 46a8c766
  zhengyi authored Oct 30, 2024
  
  46a8c766
- 到仓数据更新bug修复 · b57c4ab2
  zhengyi authored Oct 30, 2024
  
  b57c4ab2
- 到仓数据更新bug修复 · 7f47203a
  zhengyi authored Oct 30, 2024
  
  7f47203a
- 到仓业务修改更新 · 374ec321
  332784038@qq.com authored Oct 30, 2024
  
  374ec321
- 到仓业务删除不使用的代码 · c19f30c0
  332784038@qq.com authored Oct 30, 2024
  
  c19f30c0
- Merge branch 'dev' into test · 5a95d87d
  332784038@qq.com authored Oct 30, 2024
  
  5a95d87d
- 到仓业务补充 · e5c84ce7
  332784038@qq.com authored Oct 30, 2024
  
  e5c84ce7
29 Oct, 2024 2 commits
- 优惠活动列表查询条件优化 · 1cfbe91a
  xiamw authored Oct 29, 2024
  
  1cfbe91a
- Merge branch 'dev' into test · c8815893
  332784038@qq.com authored Oct 29, 2024
  
  c8815893