Commits · 6a97b715140e73cc69de005ca105974aa6eebead · haoban3.0 / haoban-manage3.0

23 Apr, 2025 2 commits
- Merge branch 'feature-content202505' into developer · 6a97b715
  王祖波 authored Apr 23, 2025
  
  6a97b715 Browse Files
- 增加订单渠道、订单id · 6a8c3d46
  王祖波 authored Apr 23, 2025
  
  6a8c3d46 Browse Files
22 Apr, 2025 16 commits
- Merge branch 'feature-content202505' into 'developer' · a97fbbb7
```
修改为支持批量查询商品

See merge request !2830
```
  王祖波 authored Apr 22, 2025
  a97fbbb7 Browse Files
- 修改为支持批量查询商品 · cf3b3b40
  王祖波 authored Apr 22, 2025
  
  cf3b3b40 Browse Files
- Merge branch 'feature/xgh/202503' into 'developer' · 3a224bb7
```
Feature/xgh/202503

See merge request !2829
```
  徐高华 authored Apr 22, 2025
  3a224bb7 Browse Files
- 朋友圈bug · 30cd2f3d
  徐高华 authored Apr 22, 2025
  
  30cd2f3d Browse Files
- Merge branch 'feature-content202505' into developer · 3cf71a86
  王祖波 authored Apr 22, 2025
  
  3cf71a86 Browse Files
- 增加跟进时间 · ec6fdba2
  王祖波 authored Apr 22, 2025
  
  ec6fdba2 Browse Files
- Merge branch 'feature-content202505' into developer · bb03d639
  王祖波 authored Apr 22, 2025
  
  bb03d639 Browse Files
- 增加导购id · b5c7e5df
  王祖波 authored Apr 22, 2025
  
  b5c7e5df Browse Files
- 刷新线索冗余orderId、channelCode · 34f1820d
  王祖波 authored Apr 22, 2025
  
  34f1820d Browse Files
- Merge branch 'feature-content202505' into 'developer' · 59e83fcf
```
刷新线索冗余orderId、channelCode

See merge request !2828
```
  王祖波 authored Apr 22, 2025
  59e83fcf Browse Files
- 刷新线索冗余orderId、channelCode · fe441714
  王祖波 authored Apr 22, 2025
  
  fe441714 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · c5ec150a
  王祖波 authored Apr 22, 2025
  
  c5ec150a Browse Files
- Merge branch 'feature-content202505' into developer · 95b201e4
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/InteractRecordApiServiceImpl.java
```
  王祖波 authored Apr 22, 2025
  95b201e4 Browse Files
- 销售线索查询 · 025355b4
  王祖波 authored Apr 22, 2025
  
  025355b4 Browse Files
- Merge branch 'feature-recommend' into 'developer' · b0077034
```
bizId为空

See merge request !2827
```
  王祖波 authored Apr 22, 2025
  b0077034 Browse Files
- bizId为空 · 4a8fafbf
  王祖波 authored Apr 22, 2025
  
  4a8fafbf Browse Files
21 Apr, 2025 22 commits
- Merge branch 'feature-recommend' into 'developer' · 2e95e08a
```
导购为空不处理

See merge request !2825
```
  王祖波 authored Apr 21, 2025
  2e95e08a Browse Files
- 导购为空不处理 · a7600523
  王祖波 authored Apr 21, 2025
  
  a7600523 Browse Files
- Merge branch 'feature-recommend' into 'developer' · c6414978
```
导购为空不处理

See merge request !2823
```
  王祖波 authored Apr 21, 2025
  c6414978 Browse Files
- 导购为空不处理 · f767d2f8
  王祖波 authored Apr 21, 2025
  
  f767d2f8 Browse Files
- Merge branch 'feature-content202505' into 'developer' · b80c238c
```
log

See merge request !2821
```
  王祖波 authored Apr 21, 2025
  b80c238c Browse Files
- log · 739897bb
  王祖波 authored Apr 21, 2025
  
  739897bb Browse Files
- Merge branch 'feature-content202505' into 'developer' · 91c045af
```
重点跟进不更新跟进时间

See merge request !2820
```
  王祖波 authored Apr 21, 2025
  91c045af Browse Files
- 重点跟进不更新跟进时间 · 08a8767d
  王祖波 authored Apr 21, 2025
  
  08a8767d Browse Files
- Merge branch 'feature-content202505' into 'developer' · f5c36540
```
更新跟进时间

See merge request !2819
```
  王祖波 authored Apr 21, 2025
  f5c36540 Browse Files
- 更新跟进时间 · 611bab72
  王祖波 authored Apr 21, 2025
  
  611bab72 Browse Files
- Merge branch 'feature-content202505' into developer · e9b84e8f
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/InteractRecordService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/InteractRecordServiceImpl.java
```
  王祖波 authored Apr 21, 2025
  e9b84e8f Browse Files
- 更新跟进时间 · 5c06ae85
  王祖波 authored Apr 21, 2025
  
  5c06ae85 Browse Files
- Merge branch 'feature-recommend' into 'master' · 590285b7
```
更新unionId

See merge request !2818
```
  王祖波 authored Apr 21, 2025
  590285b7 Browse Files
- Merge branch 'master' into 'feature-recommend' · 99e3d482
```
# Conflicts:
#   haoban-manage3-service/src/main/resources/mapper/content/TabHaobanInteractRecordMapper.xml
```
  王祖波 authored Apr 21, 2025
  99e3d482 Browse Files
- 更新unionId · f51c2be1
  王祖波 authored Apr 21, 2025
  
  f51c2be1 Browse Files
- Merge branch 'feature-recommend' into 'developer' · 87181d7f
```
更新unionId

See merge request !2817
```
  王祖波 authored Apr 21, 2025
  87181d7f Browse Files
- Merge branch 'developer' into 'feature-recommend' · d917ca0c
```
# Conflicts:
#   haoban-manage3-service/src/main/resources/mapper/content/TabHaobanInteractRecordMapper.xml
```
  王祖波 authored Apr 21, 2025
  d917ca0c Browse Files
- 更新unionId · d6116658
  王祖波 authored Apr 21, 2025
  
  d6116658 Browse Files
- Merge branch 'feature-recommend' into 'developer' · 0b1d08eb
```
销售线索服务校验

See merge request !2816
```
  王祖波 authored Apr 21, 2025
  0b1d08eb Browse Files
- Merge branch 'feature-recommend' into 'master' · eb3e9074
```
销售线索服务校验

See merge request !2815
```
  王祖波 authored Apr 21, 2025
  eb3e9074 Browse Files
- 销售线索服务校验 · 75810b35
  王祖波 authored Apr 21, 2025
  
  75810b35 Browse Files
- Merge branch 'feature-recommend' into 'master' · 1067ce9e
```
销售线索服务校验

See merge request !2814
```
  王祖波 authored Apr 21, 2025
  1067ce9e Browse Files