Commits · 188078d1e51b6ccb7cd7c53275c753ae66df2227 · lanbaoming / jiedao-api-boot-master · GitLab

30 Aug, 2024 17 commits
- 自动核销功能 · 188078d1
  chenjiuping authored Aug 30, 2024
  
  188078d1
- 空运提单计算总金额错误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
- 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
- 会员积分查询增加会员编号 · 58c8500e
  zhangfeng authored Aug 30, 2024
  
  58c8500e
- 流程枚举名称变更 · 2c606bba
  jiuping authored Aug 30, 2024
  
  2c606bba
- 流程枚举名称变更 · 73221ee5
  jiuping authored Aug 30, 2024
  
  73221ee5
- 兼容收货人限制修改申请审批的历史数据bug · 5af27caf
  332784038@qq.com authored Aug 30, 2024
  
  5af27caf
- Merge branch 'order-update' into dev · e148f096
  332784038@qq.com authored Aug 30, 2024
  
  e148f096
- 补充新的审批国际化文案 · 4161180b
  332784038@qq.com authored Aug 30, 2024
  
  4161180b
- Merge branch 'order-update' into dev · 048a7a9a
  332784038@qq.com authored Aug 30, 2024
  
  048a7a9a
- 收货人限制修改申请订单审批状态更新 · bb1cae6d
  332784038@qq.com authored Aug 30, 2024
  
  bb1cae6d
29 Aug, 2024 23 commits
- 提交申请时补充完整原单审批信息，避免前端漏传或错误传递原单参数信息 · be092445
  zhengyi authored Aug 29, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  be092445
- 收货人限制修改申请业务参数判断bug修改 · 0d67351f
  zhengyi authored Aug 29, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  0d67351f
- Merge branch 'order-update' into dev · 566ffccb
  zhengyi authored Aug 29, 2024
  
  566ffccb
- 收货人限制修改审批日志数据完善 · 5d7680e8
  zhengyi authored Aug 29, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  5d7680e8
- Merge branch 'inquiry-zhengyi' into dev · ba8b04e1
  zhengyi authored Aug 29, 2024
  
  ba8b04e1
- 单询异常处理时补充操作数据日志 · 0f61b1e6
  zhengyi authored Aug 29, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  0f61b1e6
- 删除无用导包 · 070e29d6
  zhengyi authored Aug 29, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  070e29d6
- 收货人限制修改审批bug修复 · c0b971f1
  zhengyi authored Aug 29, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  c0b971f1
- 出货短信发送bug修复 · f5ab3539
  332784038@qq.com authored Aug 29, 2024
  
  f5ab3539
- Merge branch 'master-special' into dev · 364edcbe
  332784038@qq.com authored Aug 29, 2024
  
  364edcbe
- 批量特价申请bug修复 · e18e4476
  332784038@qq.com authored Aug 29, 2024
  
  e18e4476
- Merge branch 'inquiry-zhengyi' into dev · 9f7337c6
  332784038@qq.com authored Aug 29, 2024
  
  9f7337c6
- 订单V值触发日志修改 · d961bbcb
  zhangfeng authored Aug 29, 2024
  
  d961bbcb
- 订单V值触发加锁 · 78b37103
  zhangfeng authored Aug 29, 2024
  
  78b37103
- 订单V值触发日志修改 · 308e8702
  zhangfeng authored Aug 29, 2024
  
  308e8702
- 处理单询异常时需要判断是否产生预付异常 · 2655da92
  332784038@qq.com authored Aug 29, 2024
  
  2655da92
- Merge branch 'inquiry-zhengyi' into dev · 6ea33e54
  332784038@qq.com authored Aug 29, 2024
  
  6ea33e54
- 处理单询异常时需要判断是否产生预付异常 · aa27c1b4
  332784038@qq.com authored Aug 29, 2024
  
  aa27c1b4
- 订单V值触发修改 · f84e6c70
  zhangfeng authored Aug 29, 2024
  
  f84e6c70
- 订单V值触发日志添加 · 43b48470
  zhangfeng authored Aug 29, 2024
  
  43b48470
- 处理单询异常时需要判断是否产生预付异常 · 313d54a8
  332784038@qq.com authored Aug 29, 2024
  
  313d54a8
- 订单查询参数重构 · 2cf32a01
  332784038@qq.com authored Aug 29, 2024
  
  2cf32a01
- Merge branch 'order-update' into dev · 5a41bced
  332784038@qq.com authored Aug 29, 2024
  
  5a41bced