Commits · 313d54a8fcf2435a2c5dbe57b9bf64c77368ef8a · lanbaoming / jiedao-api-boot-master · GitLab

29 Aug, 2024 7 commits
- 处理单询异常时需要判断是否产生预付异常 · 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
- Merge remote-tracking branch 'origin/order-update' into order-update · 9cff5ef7
  332784038@qq.com authored Aug 29, 2024
  
  9cff5ef7
- 订单查询参数重构 · ddb8bdfd
  332784038@qq.com authored Aug 29, 2024
  
  ddb8bdfd
- 订单V值触发日志添加 · db8172a4
  zhangfeng authored Aug 29, 2024
  
  db8172a4
- 兑换礼品校验兑换次数修改 · 39abcadf
  zhangfeng authored Aug 29, 2024
  
  39abcadf
28 Aug, 2024 18 commits
- Merge branch '_dev_yh' into dev · 0e9c098e
  yanghao authored Aug 28, 2024
  
  0e9c098e
- Merge branch 'order-update' into dev · 2930112d
  zhengyi authored Aug 28, 2024
  
  2930112d
- 补充控货订单的新增审批任务操作日志 · 7126027d
  zhengyi authored Aug 28, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  7126027d
- 放货时有控货相关审批任务限制 · 50f91b7c
  zhengyi authored Aug 28, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  50f91b7c
- chore: 客户详情中订单tag查询方式修改为订单页面查询一致的条件 · d8d5beda
  yanghao authored Aug 28, 2024
  
  d8d5beda
- Merge branch 'order-update' into dev · d4542639
  zhengyi authored Aug 28, 2024
  
  d4542639
- 补充控货订单查询参数放货锁定收货人到期时间和订单限制修改收货人状态 · f15fe7cf
  zhengyi authored Aug 28, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  f15fe7cf
- chore: 客户详情中订单tag查询方式修改为订单页面查询一致的条件 · 53237f19
  yanghao authored Aug 28, 2024
  
  53237f19
- Merge branch '_dev_yh' into dev · ae42f7c0
  yanghao authored Aug 28, 2024
  
  ae42f7c0
- chore: 客户列表返回添加字段 · f18abcb6
  yanghao authored Aug 28, 2024
  
  f18abcb6
- Merge remote-tracking branch 'origin/master-shw' into dev · 8c3b69ea
  332784038@qq.com authored Aug 28, 2024
  
  8c3b69ea
- Merge branch 'master-make-bill-of-lading' into dev · ddce604f
  332784038@qq.com authored Aug 28, 2024
  
  ddce604f
- 重置修改提单业务bug修复 · eee2b3f3
  332784038@qq.com authored Aug 28, 2024
  
  eee2b3f3
- 接口补充 · c323c4d1
  332784038@qq.com authored Aug 28, 2024
  
  c323c4d1
- Merge branch 'order-update' into dev · 2004daef
  332784038@qq.com authored Aug 28, 2024
  
  2004daef
- 放货限制修改申请参数补充更新 · 4baa88f3
  332784038@qq.com authored Aug 28, 2024
  
  4baa88f3
- Merge branch 'refs/heads/feature_member_score' into dev · 74b4d5ec
  zhangfeng authored Aug 28, 2024
  
  74b4d5ec
- 会员功能开关 · a682a25a
  zhangfeng authored Aug 28, 2024
  
  a682a25a
27 Aug, 2024 15 commits
- 完善控货订单放货限制修改申请业务 · 03ff9fb0
  zhengyi authored Aug 27, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  03ff9fb0
- 控货相关的审批业务部分提交 · 130b198d
  zhengyi authored Aug 27, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  130b198d
- Merge branch 'master_jiuping' into dev · ec4cc447
  zhengyi authored Aug 27, 2024
  
  ec4cc447
- 增加目的仓搜索 · a6efef05
  joy authored Aug 27, 2024
  
  a6efef05
- Merge branch 'order-update' into dev · edef6c19
  332784038@qq.com authored Aug 27, 2024
  
  edef6c19
- 订单无收货人时的业务逻辑兼容性调整 · 1c190955
  332784038@qq.com authored Aug 27, 2024
  
  1c190955
- Merge branch '_dev_yh' into dev · 09c113ee
  yanghao authored Aug 27, 2024
  
  09c113ee
- chore: 客户详情报价单返回报价id · 83fff53a
  yanghao authored Aug 27, 2024
  
  83fff53a
- chore: 订单返回到仓和出仓时间的格式修改 · e7f405a5
  yanghao authored Aug 27, 2024
  
  e7f405a5
- Merge branch 'master-auth-idcard' · 53f5ebcb
  332784038@qq.com authored Aug 27, 2024
  
  53f5ebcb
- Merge remote-tracking branch 'origin/dev' into dev · f2920c14
  332784038@qq.com authored Aug 27, 2024
  
  f2920c14
- Merge branch 'master-auth-idcard' into dev · 2e9e848c
  332784038@qq.com authored Aug 27, 2024
  
  2e9e848c
- 会员身份认证信息允许重新提交再次认证 · 76e19680
  332784038@qq.com authored Aug 27, 2024
  
  76e19680
- 订单模式变更工作流 · 375eb5cb
  jiuping authored Aug 27, 2024
  
  375eb5cb
- Merge branch '_dev_yh' into dev · fbd88a3f
  yanghao authored Aug 27, 2024
  
  fbd88a3f