Commits · 440c2ff39d2693051fabc75bd96deda87cd2e49e · lanbaoming / jiedao-api-boot-master · GitLab

11 Sep, 2024 12 commits
- Merge branch 'release-fix' into release · 440c2ff3
  332784038@qq.com authored Sep 11, 2024
  
  440c2ff3
- Merge remote-tracking branch 'origin/release-fix' into release-fix · ef591c0f
  332784038@qq.com authored Sep 11, 2024
  
  ef591c0f
- sql修复 · c7abc20e
  332784038@qq.com authored Sep 11, 2024
  
  c7abc20e
- Merge remote-tracking branch 'origin/release' into release · 8acb951c
  zhangfeng authored Sep 11, 2024
  
  8acb951c
- 礼品分页返回VO修改 · 272cde23
  zhangfeng authored Sep 11, 2024
  
  272cde23
- Merge branch 'release-fix' into release · b684bbc1
  yanghao authored Sep 11, 2024
  
  b684bbc1
- chore: 客户跟进导出excel的名称和位置调整 · aa34cc16
  yanghao authored Sep 11, 2024
  
  aa34cc16
- Merge branch 'release-fix' into release · e2119947
  332784038@qq.com authored Sep 11, 2024
  
  e2119947
- dev配置文件切换为debug日志输出 · 101447ce
  332784038@qq.com authored Sep 11, 2024
  
  101447ce
- 修复订单查询相关sql · 67a3e3bf
  332784038@qq.com authored Sep 11, 2024
  
  67a3e3bf
- 误提交。注释代码 · 56002030
  huyf authored Sep 11, 2024
  
  56002030
- 误提交。注释代码 · 61b11b55
  huyf authored Sep 11, 2024
  
  61b11b55
10 Sep, 2024 28 commits
- Merge branch 'release-fix' into release · 8eba1aa4
  yanghao authored Sep 10, 2024
  
  8eba1aa4
- chore: 更新客户设置接口 · 0c80de6a
  yanghao authored Sep 10, 2024
  
  0c80de6a
- 提货箱数、提货率、提货状态回填 · a9fe4617
  huyf authored Sep 10, 2024
  
  a9fe4617
- 提货箱数、提货率、提货状态回填 · 7bbe1167
  huyf authored Sep 10, 2024
  
  7bbe1167
- 提货箱数、提货率、提货状态回填 · 66987a51
  huyf authored Sep 10, 2024
  
  66987a51
- 提货箱数、提货率、提货状态回填 · 4a0bead7
  huyf authored Sep 10, 2024
  
  4a0bead7
- Merge branch 'master-fix' into release · 82f89051
  zhengyi authored Sep 10, 2024
  
  82f89051
- 入仓动态业务时间逻辑修改，移除预装导致订单重新入仓时不再对订单动态业务时间进行重置 · 73dd431f
  zhengyi authored Sep 10, 2024
  
  73dd431f
- chore: 客户跟进联系人由名称修改为id，并在列表中返回联系人电话. · 60b3c19a
  yanghao authored Sep 10, 2024
  
  60b3c19a
- 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