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

11 Jun, 2025 18 commits
- Merge branch 'feature-recommend3' into 'developer' · cba92693
```
刷新建联时间

See merge request !2945
```
  王祖波 authored Jun 11, 2025
  cba92693 Browse Files
- 刷新建联时间 · ccd52959
  王祖波 authored Jun 11, 2025
  
  ccd52959 Browse Files
- Merge branch 'feature-recommend3' into 'developer' · 4180ff58
```
多个建联时间

See merge request !2944
```
  王祖波 authored Jun 11, 2025
  4180ff58 Browse Files
- 多个建联时间 · 74f6021d
  王祖波 authored Jun 11, 2025
  
  74f6021d Browse Files
- Merge branch 'feature-recommend3' into developer · 5e684e06
  王祖波 authored Jun 11, 2025
  
  5e684e06 Browse Files
- 同步建联时间 · fe2ede79
  王祖波 authored Jun 11, 2025
  
  fe2ede79 Browse Files
- Merge branch 'feature-recommend3' into 'developer' · f2dc2be2
```
初始化建联时间数组

See merge request !2943
```
  王祖波 authored Jun 11, 2025
  f2dc2be2 Browse Files
- 初始化建联时间数组 · bd4d39c0
  王祖波 authored Jun 11, 2025
  
  bd4d39c0 Browse Files
- Merge branch 'feature-recommend3' into 'developer' · 50e400bc
```
多个建联时间修改es字段

See merge request !2942
```
  王祖波 authored Jun 11, 2025
  50e400bc Browse Files
- 多个建联时间修改es字段 · 1e6147ee
  王祖波 authored Jun 11, 2025
  
  1e6147ee Browse Files
- Merge branch 'feature-recommend3' into 'developer' · bec2d661
```
机会人群建联校验

See merge request !2941
```
  王祖波 authored Jun 11, 2025
  bec2d661 Browse Files
- 机会人群建联校验 · 68ef9ea3
  王祖波 authored Jun 11, 2025
  
  68ef9ea3 Browse Files
- Merge branch 'feature-recommend3' into 'developer' · 103ad187
```
Feature recommend3

See merge request !2940
```
  王祖波 authored Jun 11, 2025
  103ad187 Browse Files
- 建联时间长度判断 · 09375e00
  王祖波 authored Jun 11, 2025
  
  09375e00 Browse Files
- 建联潜客分 · 717a8e23
  王祖波 authored Jun 11, 2025
  
  717a8e23 Browse Files
- 多个建联 · f74b882b
  王祖波 authored Jun 11, 2025
  
  f74b882b Browse Files
- Merge branch 'feature-recommend3' into developer · 1d10bb2a
  王祖波 authored Jun 11, 2025
  
  1d10bb2a Browse Files
- 多个建联 · 412a7a96
  王祖波 authored Jun 11, 2025
  
  412a7a96 Browse Files
10 Jun, 2025 4 commits
- Merge branch 'feature-recommend3' into developer · 7e79a18e
  王祖波 authored Jun 10, 2025
  
  7e79a18e Browse Files
- 同步建联 · 5af432aa
  王祖波 authored Jun 10, 2025
  
  5af432aa Browse Files
- Merge branch 'master' into feature-recommend3 · 99434657
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/contact/impl/ContactLogServiceImpl.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/contact/ContactOrderApiServiceImpl.java
```
  王祖波 authored Jun 10, 2025
  99434657 Browse Files
- 同步建联 · ab9f41af
  王祖波 authored Jun 10, 2025
  
  ab9f41af Browse Files
09 Jun, 2025 15 commits
- Merge branch 'feature/xgh/bug/0609' into 'master' · c42aa1bb
```
异常

See merge request !2939
```
  徐高华 authored Jun 09, 2025
  c42aa1bb Browse Files
- 异常 · 60068981
  徐高华 authored Jun 09, 2025
  
  60068981 Browse Files
- Merge branch 'feature/xgh/bug/0609' into 'developer' · bbaf0bc0
```
Feature/xgh/bug/0609

See merge request !2938
```
  徐高华 authored Jun 09, 2025
  bbaf0bc0 Browse Files
- Merge branch 'feature/xgh/bug/0609' into 'master' · 81938625
```
sql调整

See merge request !2937
```
  徐高华 authored Jun 09, 2025
  81938625 Browse Files
- sql调整 · 70cfe9dd
  徐高华 authored Jun 09, 2025
  
  70cfe9dd Browse Files
- Merge branch 'feature-recommend2' into 'developer' · a8089740
```
清除建联逻辑

See merge request !2936
```
  王祖波 authored Jun 09, 2025
  a8089740 Browse Files
- Merge branch 'feature-recommend2' into 'master' · 82ed6e40
```
清除建联逻辑

See merge request !2935
```
  王祖波 authored Jun 09, 2025
  82ed6e40 Browse Files
- 清除建联逻辑 · 9c7b4e9c
  王祖波 authored Jun 09, 2025
  
  9c7b4e9c Browse Files
- Merge branch 'feature-recommend2' into 'developer' · 10ef4d47
```
清除建联逻辑

See merge request !2934
```
  王祖波 authored Jun 09, 2025
  10ef4d47 Browse Files
- Merge branch 'feature-recommend2' into 'master' · 31817a23
```
清除建联逻辑

See merge request !2933
```
  王祖波 authored Jun 09, 2025
  31817a23 Browse Files
- 清除建联逻辑 · a105918f
  王祖波 authored Jun 09, 2025
  
  a105918f Browse Files
- Merge branch 'feature/xgh/20250609' into 'developer' · cc1b9d43
```
刷新好友流水表加删除记录

See merge request !2932
```
  徐高华 authored Jun 09, 2025
  cc1b9d43 Browse Files
- 刷新好友流水表加删除记录 · f8711576
  徐高华 authored Jun 09, 2025
  
  f8711576 Browse Files
- Merge branch 'feature/xgh/20250609' into 'developer' · 1656d954
```
Feature/xgh/20250609

See merge request !2931
```
  徐高华 authored Jun 09, 2025
  1656d954 Browse Files
- 群发素材接口 · 8d45264e
  徐高华 authored Jun 09, 2025
  
  8d45264e Browse Files
05 Jun, 2025 3 commits
- Merge branch 'feature/xgh/202504会员分组' · fc47d5d4
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
```
  徐高华 authored Jun 05, 2025
  fc47d5d4 Browse Files
- Merge branch 'feature/xgh/202506基础' into developer · 5890a012
  徐高华 authored Jun 05, 2025
  
  5890a012 Browse Files
- Merge branch 'feature-recommend2' · 2593d7bd
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
```
  王祖波 authored Jun 05, 2025
  2593d7bd Browse Files