Commits · c5ec150aaebecdf33269531c0729a64c98abbbbe · haoban3.0 / haoban-manage3.0

22 Apr, 2025 5 commits
- 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 32 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
- Merge branch 'feature-recommend' into 'developer' · 5f2eab72
```
销售线索服务校验

See merge request !2813
```
  王祖波 authored Apr 21, 2025
  5f2eab72 Browse Files
- 销售线索服务校验 · a9387ec0
  王祖波 authored Apr 21, 2025
  
  a9387ec0 Browse Files
- Merge branch 'feature-recommend' into 'master' · 44374fd8
```
Feature recommend

See merge request !2812
```
  王祖波 authored Apr 21, 2025
  44374fd8 Browse Files
- Merge branch 'feature-recommend' into 'developer' · ba8373a5
```
Feature recommend

See merge request !2811
```
  王祖波 authored Apr 21, 2025
  ba8373a5 Browse Files
- key · 5fcfde8a
  王祖波 authored Apr 21, 2025
  
  5fcfde8a Browse Files
- key · 7082606a
  王祖波 authored Apr 21, 2025
  
  7082606a Browse Files
- Merge branch 'feature-recommend' into 'developer' · bf664ee9
```
log

See merge request !2810
```
  王祖波 authored Apr 21, 2025
  bf664ee9 Browse Files
- log · c781eaeb
  王祖波 authored Apr 21, 2025
  
  c781eaeb Browse Files
- Merge branch 'feature-recommend' into 'developer' · 4a6352ef
```
监听刷新holo

See merge request !2809
```
  王祖波 authored Apr 21, 2025
  4a6352ef Browse Files
- 监听刷新holo · 23d82b88
  王祖波 authored Apr 21, 2025
  
  23d82b88 Browse Files
17 Apr, 2025 3 commits
- Merge branch 'feature-recommend' into 'developer' · 78bed5d7
```
跟进记录按会员维度查询

See merge request !2808
```
  王祖波 authored Apr 17, 2025
  78bed5d7 Browse Files
- Merge branch 'feature-recommend' into 'master' · 73db289c
```
跟进记录按会员维度查询

See merge request !2807
```
  王祖波 authored Apr 17, 2025
  73db289c Browse Files
- 跟进记录按会员维度查询 · 97571d27
  王祖波 authored Apr 17, 2025
  
  97571d27 Browse Files