Commits · 7bbe1167c35756d1f89156ffa538d9e83fdc5bde · lanbaoming / jiedao-api-boot-master · GitLab

10 Sep, 2024 25 commits
- 提货箱数、提货率、提货状态回填 · 7bbe1167
  huyf authored Sep 10, 2024
  
  7bbe1167
- Merge branch 'master-fix' into release · 82f89051
  zhengyi authored Sep 10, 2024
  
  82f89051
- 入仓动态业务时间逻辑修改，移除预装导致订单重新入仓时不再对订单动态业务时间进行重置 · 73dd431f
  zhengyi authored Sep 10, 2024
  
  73dd431f
- chore: 客户跟进联系人由名称修改为id，并在列表中返回联系人电话. · 58d75c05
  yanghao authored Sep 10, 2024
  
  58d75c05
- Merge branch 'release-fix' into release · 273fc4dd
  yanghao authored Sep 10, 2024
  
  273fc4dd
- chore: 客户跟进联系人由名称修改为id，并在列表中返回联系人电话. · 8cfe987a
  yanghao authored Sep 10, 2024
  
  8cfe987a
- Merge branch 'master-fix' into release · 59d54f2e
  zhengyi authored Sep 10, 2024
  
  59d54f2e
- 生产订单实时计价参数问题修复，入仓订单包装单位空值问题 · f2af5d64
  zhengyi authored Sep 10, 2024
  
  f2af5d64
- chore: 添加客户跟进导出类型的字典 · 296ad3e2
  yanghao authored Sep 10, 2024
  
  296ad3e2
- chore: 客户跟进联系人由名称修改为id，并在列表中返回联系人电话. · 578e3634
  yanghao authored Sep 10, 2024
  
  578e3634
- Merge branch 'release-fix' into release · d8c15dc3
  yanghao authored Sep 10, 2024
  
  d8c15dc3
- chore: 客户添加单独的设置功能 · 0121e121
  yanghao authored Sep 10, 2024
  
  0121e121
- Merge branch 'release-zhangfeng' into 'release' · ffa5db4d
  zhangfeng authored Sep 10, 2024
```
礼品兑换网点属性改为提货点（仓库）

See merge request !17
```
  ffa5db4d
- 礼品兑换网点属性改为提货点（仓库） · 920f3bee
  zhangfeng authored Sep 09, 2024
  
  920f3bee
- fix: 我的客户-订单标签页订单数据中返回报价单号和报价id · 1f93d161
  yanghao authored Sep 10, 2024
  
  1f93d161
- Merge branch 'release-fix' of... · f1d77456
  yanghao authored Sep 10, 2024
```
Merge branch 'release-fix' of http://110.41.143.128:8081/lanbaoming/jiedao-api-boot-master into release-fix
```
  f1d77456
- Merge remote-tracking branch 'origin/release' into release · e0d1141f
  332784038@qq.com authored Sep 10, 2024
  
  e0d1141f
- 订单详情目的城市信息 · 5c87bb78
  332784038@qq.com authored Sep 10, 2024
  
  5c87bb78
- sourceIds · 136814f0
  joy authored Sep 10, 2024
  
  136814f0
- fix: 修复年度发货次数=0时查询数据不准确的bug · e7d6687f
  yanghao authored Sep 10, 2024
  
  e7d6687f
- Merge remote-tracking branch 'origin/release-fix' into release-fix · 6cfe4b66
  332784038@qq.com authored Sep 10, 2024
  
  6cfe4b66
- 查询sql条件补充完善 · 99022f79
  332784038@qq.com authored Sep 10, 2024
  
  99022f79
- 增加查询条件 · 3459a90f
  joy authored Sep 10, 2024
  
  3459a90f
- 查询sql条件补充完善 · 16ad5b47
  332784038@qq.com authored Sep 10, 2024
  
  16ad5b47
- 目的国查询sql修复 · 7df3a57a
  332784038@qq.com authored Sep 10, 2024
  
  7df3a57a
09 Sep, 2024 15 commits
- fix: #290 【跟进】新增/编辑跟进记录没有插入到客户日志档案 · 02c8be92
  yanghao authored Sep 09, 2024
  
  02c8be92
- fix: #297 设置开启默认开票，编辑界面默认开票按钮为关闭状态 · 17edcbdc
  yanghao authored Sep 09, 2024
  
  17edcbdc
- fix: #297 设置开启默认开票，编辑界面默认开票按钮为关闭状态 · 40d9ca93
  yanghao authored Sep 09, 2024
  
  40d9ca93
- 新增字段定义错误修复 · 741af122
  zhengyi authored Sep 09, 2024
  
  741af122
- 代码冲突修复，并补充收货地址的国家、省、市数据冗余到主订单表 · 5778c2c1
  zhengyi authored Sep 09, 2024
  
  5778c2c1
- 复制订单bug修复 · e4582ea5
  zhengyi authored Sep 09, 2024
  
  e4582ea5
- 订单无收货人时，无法保存收货地址的数据bug修复 · 86acfc06
  zhengyi authored Sep 09, 2024
  
  86acfc06
- 订单无收货人时，无法保存收货地址的数据bug修复 · 779aca78
  zhengyi authored Sep 09, 2024
  
  779aca78
- 订单无收货人时，无法保存收货方式的数据bug修复 · b6ac3678
  zhengyi authored Sep 09, 2024
  
  b6ac3678
- chore: 客户跟进bug修复 · f17caac1
  yanghao authored Sep 09, 2024
  
  f17caac1
- chore: 客户查询增加常用提货点 · ea80b86b
  yanghao authored Sep 09, 2024
  
  ea80b86b
- chore: 增加客户跟进的跟进方式查询条件 · 9c0fadf7
  yanghao authored Sep 09, 2024
  
  9c0fadf7
- 订单列表相关查询都要排除已删除的订单收发货人信息 · b58b208f
  332784038@qq.com authored Sep 09, 2024
  
  b58b208f
- 修改数据更新脚本 · 286d962d
  332784038@qq.com authored Sep 09, 2024
  
  286d962d
- 放货率数据冗余及查询 · b1561fa6
  332784038@qq.com authored Sep 09, 2024
  
  b1561fa6