Commits · 6256ae5858210715ef8c87fd44469332457b3ad2 · lanbaoming / jiedao-api-boot-master

25 Aug, 2024 16 commits
- 联调仓库参数设置的免租时长和控货订单收货人限制时长 · 6256ae58
  zhengyi authored Aug 25, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  6256ae58
- 提供预警控货订单列表查询业务 · 25ac6d8b
  zhengyi authored Aug 25, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  25ac6d8b
- Merge branch 'dev' into order-update · b42315dc
  zhengyi authored Aug 25, 2024
```
# Conflicts:
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderBackPageVO.java
```
  b42315dc
- Merge branch 'dev' into order-update · 84198cec
  zhengyi authored Aug 25, 2024
```
# Conflicts:
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/i18n/messages.properties
#	yudao-server/src/main/resources/i18n/messages_en.properties
#	yudao-server/src/main/resources/i18n/messages_zh.properties
```
  84198cec
- chore: 客户详情中订单tag添加字段 · dc5d6b48
  yanghao authored Aug 25, 2024
  
  dc5d6b48
- chore: 客户详情添加报价的字段和查询 · 3ce30b31
  yanghao authored Aug 24, 2024
  
  3ce30b31
- sql: 更新客户角色sql · d1be52e1
  yanghao authored Aug 24, 2024
  
  d1be52e1
- chore: 客户的同行或代理业务由type转移到roles · 7d3eb1f2
  yanghao authored Aug 23, 2024
  
  7d3eb1f2
- chore: 1、更新客户字段 productId->productIds， pickupPoint->pickupPoints并业务实现 2、新增字段 3、更新返回sql查询 4、更新sql · 5825fdf5
  yanghao authored Aug 23, 2024
  
  5825fdf5
- chore: 添加客户更新首次成交时间的接口 · d4aad8ed
  yanghao authored Aug 22, 2024
  
  d4aad8ed
- chore: 添加客户竞争对手表及接口 · eaabfcd9
  yanghao authored Aug 22, 2024
  
  eaabfcd9
- chore: 客户添加获取方式和归属时间的实现 · 9eea35ec
  yanghao authored Aug 22, 2024
  
  9eea35ec
- chore: 客户添加创建入口 · a15d5e12
  yanghao authored Aug 21, 2024
  
  a15d5e12
- chore: 添加客户新字段 · 1a6c98c4
  yanghao authored Aug 21, 2024
  
  1a6c98c4
- 订单控货业务修改补充 · 4112dae5
  zhengyi authored Aug 25, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  4112dae5
- Merge branch 'master_jiuping' into dev · f9d3c0eb
  chenjiuping authored Aug 25, 2024
  
  f9d3c0eb
24 Aug, 2024 4 commits
- 控货订单放货收货人限制业务 · 6898f69f
  zhengyi authored Aug 24, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  6898f69f
- Merge branch 'master' into order-update · 9597cb83
  zhengyi authored Aug 24, 2024
  
  9597cb83
- 控货订单列表返回订单卸柜/到仓时间 · 68014710
  zhengyi authored Aug 24, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  68014710
- 自动核销功能 · 3d68dd86
  chenjiuping authored Aug 24, 2024
  
  3d68dd86
23 Aug, 2024 20 commits
- Merge branch 'master' into dev · 4cb5480a
  zhengyi authored Aug 23, 2024
  
  4cb5480a
- 海运与空运的到仓时间更新到订单业务修改 · b94caa15
  zhengyi authored Aug 23, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  b94caa15
- Merge branch 'master' into order-update · 3e19f25c
  zhengyi authored Aug 23, 2024
  
  3e19f25c
- Merge branch 'refs/heads/feature_member_score' into dev · 0e312220
  zhangfeng authored Aug 23, 2024
  
  0e312220
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 134fb1dc
  zhangfeng authored Aug 23, 2024
  
  134fb1dc
- 客户端礼品列表修改 · 605cfe64
  zhangfeng authored Aug 23, 2024
  
  605cfe64
- Merge branch 'master-performance' into dev · 81f17f72
  zhengyi authored Aug 23, 2024
  
  81f17f72
- 订单修改审批业绩修正bug修复 · 771f9571
  zhengyi authored Aug 23, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  771f9571
- Merge branch 'master-fix' into dev · d385446a
  zhengyi authored Aug 23, 2024
  
  d385446a
- 对与价格特殊加价的参数去重处理 · 132650df
  zhengyi authored Aug 23, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  132650df
- 复制礼品修改 · f84b7e5e
  zhangfeng authored Aug 23, 2024
  
  f84b7e5e
- Merge remote-tracking branch 'origin/dev' into dev · 416d4f6d
  zhangfeng authored Aug 23, 2024
  
  416d4f6d
- Merge branch 'refs/heads/feature_member_score' into dev · 70dfec54
  zhangfeng authored Aug 23, 2024
  
  70dfec54
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · d4222bd9
  zhangfeng authored Aug 23, 2024
  
  d4222bd9
- 兑换礼品修改 · 2c380f55
  zhangfeng authored Aug 23, 2024
  
  2c380f55
- Merge branch 'master-fix' into dev · 4b0575aa
  332784038@qq.com authored Aug 23, 2024
  
  4b0575aa
- 复制价格业务再次重构调整 · 1b1bf3a9
  332784038@qq.com authored Aug 23, 2024
  
  1b1bf3a9
- Merge branch 'master-fix' into dev · 4509f891
  332784038@qq.com authored Aug 23, 2024
  
  4509f891
- 复制价格业务再次重构调整 · 7d446b75
  332784038@qq.com authored Aug 23, 2024
  
  7d446b75
- Merge branch 'master-fix' into dev · bea6a6bf
  332784038@qq.com authored Aug 23, 2024
  
  bea6a6bf