Commits · 7e79a18e57a373a2611a037b82fff9df772c8b19 · haoban3.0 / haoban-manage3.0

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 8 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
- Merge branch 'feature-recommend2' into developer · 7899dcbd
  王祖波 authored Jun 05, 2025
  
  7899dcbd Browse Files
- 配置 · 7c25782e
  王祖波 authored Jun 05, 2025
  
  7c25782e Browse Files
- Merge branch 'feature-recommend2' into 'developer' · 6d52d6e6
```
配置

See merge request !2926
```
  王祖波 authored Jun 05, 2025
  6d52d6e6 Browse Files
- Merge branch 'feature-recommend2' into 'master' · 22692482
```
配置

See merge request !2925
```
  王祖波 authored Jun 05, 2025
  22692482 Browse Files
- 配置 · e18a95dd
  王祖波 authored Jun 05, 2025
  
  e18a95dd Browse Files
04 Jun, 2025 13 commits
- Merge branch 'feature-recommend2' into 'master' · 47690bc1
```
配置

See merge request !2924
```
  王祖波 authored Jun 04, 2025
  47690bc1 Browse Files
- Merge branch 'feature-recommend2' into 'developer' · b53e1bc2
```
配置

See merge request !2923
```
  王祖波 authored Jun 04, 2025
  b53e1bc2 Browse Files
- 配置 · 2ab1dbbb
  王祖波 authored Jun 04, 2025
  
  2ab1dbbb Browse Files
- Merge branch 'feature-recommend2' into 'developer' · e573c037
```
配置

See merge request !2922
```
  王祖波 authored Jun 04, 2025
  e573c037 Browse Files
- Merge branch 'feature-recommend2' into 'master' · bc663ce1
```
配置

See merge request !2921
```
  王祖波 authored Jun 04, 2025
  bc663ce1 Browse Files
- 配置 · ddc73c79
  王祖波 authored Jun 04, 2025
  
  ddc73c79 Browse Files
- Merge branch 'feature-recommend2' into 'master' · 47ace296
```
配置

See merge request !2920
```
  王祖波 authored Jun 04, 2025
  47ace296 Browse Files
- Merge branch 'feature-recommend2' into developer · f6dc8033
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
```
  王祖波 authored Jun 04, 2025
  f6dc8033 Browse Files
- 配置 · 296675ed
  王祖波 authored Jun 04, 2025
  
  296675ed Browse Files
- Merge branch 'feature/xgh/202504会员分组' into 'developer' · 9b59fa29
```
登录接口

See merge request !2918
```
  徐高华 authored Jun 04, 2025
  9b59fa29 Browse Files
- 登录接口 · 06407165
  徐高华 authored Jun 04, 2025
  
  06407165 Browse Files
- Merge branch 'feature/xgh/202504会员分组' into 'developer' · 04efbf34
```
朋友拉数据换成异步+区经换绑

See merge request !2917
```
  徐高华 authored Jun 04, 2025
  04efbf34 Browse Files
- 朋友拉数据换成异步+区经换绑 · c3a04ba0
  徐高华 authored Jun 04, 2025
  
  c3a04ba0 Browse Files