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

02 Sep, 2024 5 commits
- Merge branch 'release-fix' into release · be374b20
  zhengyi authored Sep 02, 2024
  
  be374b20
- Merge remote-tracking branch 'origin/release-fix' into release-fix · 37a0a2fd
  zhengyi authored Sep 02, 2024
  
  37a0a2fd
- 1、控货订单列表的控货状态多条件查询完善 · 5b1552af
  zhengyi authored Sep 02, 2024
```
2、订单列表补充商品类型多条件查询
```
  5b1552af
- Merge branch 'release-fix' into release · 5dddd60d
  332784038@qq.com authored Sep 02, 2024
  
  5dddd60d
- 控货限制bug修复 · 97b0e422
  332784038@qq.com authored Sep 02, 2024
  
  97b0e422
31 Aug, 2024 19 commits
- Merge branch 'release-org' into release · 2db4e9ef
  zhengyi authored Aug 31, 2024
  
  2db4e9ef
- 补充提交 · cbe00e26
  zhengyi authored Aug 31, 2024
  
  cbe00e26
- Merge branch 'release-org' into release · 2127b0d9
  zhengyi authored Aug 31, 2024
  
  2127b0d9
- 对订单相关查询参数进行全面重构 · 8835dae9
  zhengyi authored Aug 31, 2024
  
  8835dae9
- fix: 修复跟进纪录编号生成bug · 36d49522
  yanghao authored Aug 31, 2024
  
  36d49522
- sql: 更新跟进纪录相关字典 · 27376485
  yanghao authored Aug 31, 2024
  
  27376485
- chore: 客户跟进纪录的实现和下载接口的实现 · a5224c7e
  yanghao authored Aug 31, 2024
  
  a5224c7e
- chore: 客户详情页面返回默认付款和控制无收货人 · 2202b83a
  yanghao authored Aug 31, 2024
  
  2202b83a
- Merge branch '_dev_yh' into dev · 62ae6425
  yanghao authored Aug 31, 2024
  
  62ae6425
- 审批详情获取状态判断，返回值修正 · 1ccbae41
  zhengyi authored Aug 31, 2024
  
  1ccbae41
- chore: 根据客户日志中的创建/接收/捞取的最后行为时间来更新归属时间 · 295b2149
  yanghao authored Aug 31, 2024
  
  295b2149
- 审批状态bug修复 · 5d218482
  zhengyi authored Aug 31, 2024
  
  5d218482
- 审批状态bug修复 · 4a9c3b86
  zhengyi authored Aug 31, 2024
  
  4a9c3b86
- 流程模型key值错误修复 · 639016d9
  zhengyi authored Aug 31, 2024
  
  639016d9
- 审批初始化默认值修改 · 385c7ee6
  zhengyi authored Aug 31, 2024
  
  385c7ee6
- 代码错误修正 · 30944c3a
  zhengyi authored Aug 31, 2024
  
  30944c3a
- web-app的用户信息中返回其客户档案部分设置数据，以提供给前端做发货等操作数据判断 · 6c948192
  zhengyi authored Aug 31, 2024
  
  6c948192
- 调整订单编辑详情 · 8673c525
  zhengyi authored Aug 31, 2024
  
  8673c525
- 控货订单新的审批任务与前端联调业务调整 · 35def71f
  zhengyi authored Aug 31, 2024
  
  35def71f
30 Aug, 2024 16 commits
- 添加空运出仓时收发货人的首次成交时间 · 60557476
  zhengyi authored Aug 30, 2024
  
  60557476
- 添加海运封柜时收发货人的首次成交时间 · 3a4e0323
  zhengyi authored Aug 30, 2024
  
  3a4e0323
- Merge branch 'dev' into release · 43eb275d
  zhengyi authored Aug 30, 2024
  
  43eb275d
- 自动核销功能 · 188078d1
  chenjiuping authored Aug 30, 2024
  
  188078d1
- 审批申请拦截重复提交 · 15c7bfb7
  zhengyi authored Aug 30, 2024
  
  15c7bfb7
- 空运提单计算总金额错误bug · eefef7f2
  huyf authored Aug 30, 2024
  
  eefef7f2
- 空运提单计算总金额错误bug · 3dfa7aba
  huyf authored Aug 30, 2024
```
(cherry picked from commit 9e1f0f99)
```
  3dfa7aba
- chore: 1、添加字典 2、修改角色更新 · fecfe8e5
  yanghao authored Aug 30, 2024
  
  fecfe8e5
- chore: 客户补充修改默认付款和修改控货无收货人的接口 · fa434cfb
  yanghao authored Aug 30, 2024
  
  fa434cfb
- 完善订单查询数据 · 31eb5ef1
  332784038@qq.com authored Aug 30, 2024
  
  31eb5ef1
- 订单查询备案属性与报关类型多参数并行查询业务补充完整 · 32e33865
  332784038@qq.com authored Aug 30, 2024
  
  32e33865
- Merge branch 'dev' into release · ebb459b3
  332784038@qq.com authored Aug 30, 2024
  
  ebb459b3
- Merge branch 'order-update' into dev · 9a492f87
  332784038@qq.com authored Aug 30, 2024
  
  9a492f87
- 补充中文审批文案 · 28fba06a
  332784038@qq.com authored Aug 30, 2024
  
  28fba06a
- sql修复 · e76cd6dc
  332784038@qq.com authored Aug 30, 2024
  
  e76cd6dc
- 审批状态跟新调整 · 2ac4cdf6
  332784038@qq.com authored Aug 30, 2024
  
  2ac4cdf6