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

21 Apr, 2025 22 commits
- 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
15 Apr, 2025 15 commits
- Merge branch 'feature/xgh/代开发调整25年' into 'master' · 9eb16a06
```
非空判断

See merge request !2806
```
  徐高华 authored Apr 16, 2025
  9eb16a06 Browse Files
- Merge branch 'feature/xgh/代开发调整25年' into 'developer' · 14c89a3f
```
非空判断

See merge request !2805
```
  徐高华 authored Apr 16, 2025
  14c89a3f Browse Files
- 非空判断 · 65cf0bdd
  徐高华 authored Apr 16, 2025
  
  65cf0bdd Browse Files
- Merge branch 'feature/xgh/代开发调整25年' into 'master' · 96ff40c5
```
群发助手-发内容素材

See merge request !2804
```
  徐高华 authored Apr 15, 2025
  96ff40c5 Browse Files
- Merge branch 'feature/xgh/代开发调整25年' into 'developer' · a47edd75
```
Feature/xgh/代开发调整25年

See merge request !2803
```
  徐高华 authored Apr 15, 2025
  a47edd75 Browse Files
- 群发助手-发内容素材 · 946e5796
  徐高华 authored Apr 15, 2025
  
  946e5796 Browse Files
- Merge branch 'feature-recommend' · 88cf4c50
  王祖波 authored Apr 15, 2025
  
  88cf4c50 Browse Files
- Merge branch 'feature/xgh/2502朋友圈' into 'master' · 5e63bade
```
品牌名称不从门店获取

See merge request !2802
```
  徐高华 authored Apr 15, 2025
  5e63bade Browse Files
- Merge branch 'feature/xgh/代开发调整25年' into 'master' · 5886b187
```
Feature/xgh/代开发调整25年

See merge request !2801
```
  徐高华 authored Apr 15, 2025
  5886b187 Browse Files
- Merge branch 'feature/xgh/202503' into 'developer' · b69590e6
```
Feature/xgh/202503

See merge request !2800
```
  徐高华 authored Apr 15, 2025
  b69590e6 Browse Files
- 群发助手-发内容素材 · 1f48d811
  徐高华 authored Apr 15, 2025
  
  1f48d811 Browse Files
- Merge branch 'feature-recommend' into 'developer' · 1245a0cc
```
去除实时数据逻辑

See merge request !2799
```
  王祖波 authored Apr 15, 2025
  1245a0cc Browse Files
- 去除实时数据逻辑 · f9f676bb
  王祖波 authored Apr 15, 2025
  
  f9f676bb Browse Files
- 返回导购活码是否是好友 · d5178d17
  徐高华 authored Apr 15, 2025
  
  d5178d17 Browse Files
- Merge branch 'feature-recommend' into 'developer' · bb6f5271
```
潜客数据定时刷新

See merge request !2798
```
  王祖波 authored Apr 15, 2025
  bb6f5271 Browse Files