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

10 Sep, 2024 1 commit
- 礼品兑换网点属性改为提货点（仓库） · dfc55393
  zhangfeng authored Sep 09, 2024
  
  dfc55393
08 Sep, 2024 12 commits
- Merge branch 'release-fix' into dev · 63966d86
  zhengyi authored Sep 08, 2024
  
  63966d86
- 按前端查询条件改 · 7c6ad1c3
  chenjiuping authored Sep 08, 2024
  
  7c6ad1c3
- 按前端查询条件改 · 948d3f64
  chenjiuping authored Sep 08, 2024
  
  948d3f64
- 按前端查询条件改 · de1d5ed5
  chenjiuping authored Sep 08, 2024
  
  de1d5ed5
- 商品类型查询bug修复 · d2c62bfd
  zhengyi authored Sep 08, 2024
  
  d2c62bfd
- 按前端查询条件改 · 6a3d5df4
  chenjiuping authored Sep 08, 2024
  
  6a3d5df4
- 按前端查询条件改 · 0bce2816
  chenjiuping authored Sep 08, 2024
  
  0bce2816
- chore: 客户分页返回竞争对手名称 · 4ca19822
  yanghao authored Sep 08, 2024
  
  4ca19822
- 文档注释修改 · 0375d33a
  zhengyi authored Sep 08, 2024
  
  0375d33a
- 补充提交 · 1b43020a
  zhengyi authored Sep 08, 2024
  
  1b43020a
- 目的仓、目的地、目的国联动树形结构数据返回 · 492c0a95
  zhengyi authored Sep 08, 2024
  
  492c0a95
- 补充客户端获取目的国数据列表 · 28cdd065
  zhengyi authored Sep 08, 2024
  
  28cdd065
07 Sep, 2024 10 commits
- 已入仓订单修改审批时检查是否需要重新匹配优惠活动 · 7badfe68
  zhengyi authored Sep 07, 2024
  
  7badfe68
- chore: 客户合并部分更新 · 214a0d72
  yanghao authored Sep 07, 2024
  
  214a0d72
- chore: dev还原 · 867e988b
  yanghao authored Sep 07, 2024
  
  867e988b
- Merge remote-tracking branch 'origin/release-fix' into release-fix · 79908b44
  zhengyi authored Sep 07, 2024
  
  79908b44
- 查询参数补充 · 2aa080f5
  zhengyi authored Sep 07, 2024
  
  2aa080f5
- 添加入仓申请流程 · 131e173b
  chenjiuping authored Sep 07, 2024
  
  131e173b
- 异常订单查询 · 3bde7cb7
  chenjiuping authored Sep 07, 2024
  
  3bde7cb7
- fix: 跟进导出完善 · c433d8d1
  yanghao authored Sep 07, 2024
  
  c433d8d1
- fix: 客户报价调整使用报价分页接口。 · d0bd9db8
  yanghao authored Sep 07, 2024
  
  d0bd9db8
- fix: 1、返回客户缺少的字段 2、客户年度发货次数查询sqlbug修复 · 9a400c7a
  yanghao authored Sep 07, 2024
  
  9a400c7a
06 Sep, 2024 17 commits
- Merge remote-tracking branch 'origin/release-fix' into release-fix · 9468acdb
  zhengyi authored Sep 06, 2024
```
# Conflicts:
#	sql/v2.1/20240904.sql
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderPickup/OrderPickupServiceImpl.java
```
  9468acdb
- bug修复 · dfd84a4a
  zhengyi authored Sep 06, 2024
  
  dfd84a4a
- bug修复 · f3f2947e
  332784038@qq.com authored Sep 06, 2024
  
  f3f2947e
- copy订单货值补充 · 247afd88
  332784038@qq.com authored Sep 06, 2024
  
  247afd88
- 订单列表的状态与动态区分 · 8276f296
  332784038@qq.com authored Sep 06, 2024
  
  8276f296
- copy订单bug修复 · a284c494
  332784038@qq.com authored Sep 06, 2024
  
  a284c494
- Merge branch 'dev' into release · b271c52d
  332784038@qq.com authored Sep 06, 2024
  
  b271c52d
- 订单查询参数文档注释修改 · 01c23c6f
  332784038@qq.com authored Sep 06, 2024
  
  01c23c6f
- 订单查询参数文档注释修改 · 7530f515
  332784038@qq.com authored Sep 06, 2024
  
  7530f515
- chore: 添加查询登录用户的部门及下属部门，主要用于下拉列表 · a95ddc22
  yanghao authored Sep 06, 2024
  
  a95ddc22
- chore: 添加查询登录用户的部门及下属部门，主要用于下拉列表 · 7f6927d7
  yanghao authored Sep 06, 2024
  
  7f6927d7
- Merge branch 'release-fix-zhangfeng' into 'release' · 013e8262
  zhangfeng authored Sep 06, 2024
```
chore: sql更新

See merge request !16
```
  013e8262
- chore: sql更新 · d638fdaa
  zhangfeng authored Sep 06, 2024
  
  d638fdaa
- Merge branch 'master-billOfLading-fix' into dev · db96ac58
  332784038@qq.com authored Sep 06, 2024
  
  db96ac58
- Merge remote-tracking branch 'origin/release' into release · 2de7268e
  332784038@qq.com authored Sep 06, 2024
  
  2de7268e
- Merge branch 'master-billOfLading-fix' into release · 8fed62d8
  332784038@qq.com authored Sep 06, 2024
  
  8fed62d8
- 提单金额bug补充修复 · 309f888f
  332784038@qq.com authored Sep 06, 2024
  
  309f888f