Commits · 8ec63169eaf4b6c93b14c6529ef1da3bfe73a75e · haoban3.0 / haoban-manage3.0 · GitLab

14 Dec, 2023 7 commits
- Merge branch 'bugfix_20231214' into developer · 8ec63169
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MessageConvertHelper.java
```
  songyinghui authored Dec 14, 2023
  8ec63169 Browse Files
- feature: 销售线索生命周期 · 17fd9c6b
  songyinghui authored Dec 14, 2023
  
  17fd9c6b Browse Files
- Merge branch 'bugfix/xgh1212' into 'developer' · 3f247de0
```
Bugfix/xgh1212

See merge request !1584
```
  徐高华 authored Dec 14, 2023
  3f247de0 Browse Files
- Merge branch 'bugfix/xgh1212' into 'master' · 1d5f9dec
```
log

See merge request !1583
```
  徐高华 authored Dec 14, 2023
  1d5f9dec Browse Files
- log · 6a735106
  徐高华 authored Dec 14, 2023
  
  6a735106 Browse Files
- Merge branch 'bugfix/xgh1212' into 'master' · 275ad2c6
```
Bugfix/xgh1212

See merge request !1582
```
  徐高华 authored Dec 14, 2023
  275ad2c6 Browse Files
- 美邦延迟处理 · 1171308d
  徐高华 authored Dec 14, 2023
  
  1171308d Browse Files
13 Dec, 2023 5 commits
- Merge branch 'bugfix-2023-12-13-data' into 'master' · 814d91cf
```
回退3个月接口调用区分代码

See merge request !1581
```
  guojx authored Dec 13, 2023
  814d91cf Browse Files
- Merge branch 'feature-wm' into developer · 12c42f51
  songyinghui authored Dec 13, 2023
  
  12c42f51 Browse Files
- feature: 订单纬度审核素材字段 · 3f5f0216
  songyinghui authored Dec 13, 2023
  
  3f5f0216 Browse Files
- Merge branch 'bugfix-2023-12-13-data' into 'developer' · 4234a985
```
回退3个月接口调用区分代码

See merge request !1580
```
  guojx authored Dec 13, 2023
  4234a985 Browse Files
- 回退3个月接口调用区分代码 · b549de9e
  guojx authored Dec 13, 2023
  
  b549de9e Browse Files
12 Dec, 2023 4 commits
- Merge branch 'bugfix/xgh1212' into 'developer' · ee6209d7
```
美邦延迟处理

See merge request !1579
```
  徐高华 authored Dec 12, 2023
  ee6209d7 Browse Files
- 美邦延迟处理 · 7338f2fd
  徐高华 authored Dec 12, 2023
  
  7338f2fd Browse Files
- Merge remote-tracking branch 'origin/bugfix/xgh1212' into developer · 9e8b0564
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/HaobanCommonMQApiService.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HaobanCommonMQApiServiceImpl.java
```
  徐高华 authored Dec 12, 2023
  9e8b0564 Browse Files
- 拆分队列 · f764f5d5
  徐高华 authored Dec 12, 2023
  
  f764f5d5 Browse Files
08 Dec, 2023 4 commits
- Merge branch 'feature-wm' into developer · ac166094
  songyinghui authored Dec 08, 2023
  
  ac166094 Browse Files
- feature: 会员订单写数据组 · bb8d9b7b
  songyinghui authored Dec 08, 2023
  
  bb8d9b7b Browse Files
- Merge branch 'feature-wm' into developer · 84eda50f
  songyinghui authored Dec 08, 2023
  
  84eda50f Browse Files
- feature: 会员订单写数据组 · 13a74be4
  songyinghui authored Dec 08, 2023
  
  13a74be4 Browse Files
07 Dec, 2023 10 commits
- Merge branch 'feature-wm' into developer · 49087fa1
  songyinghui authored Dec 07, 2023
  
  49087fa1 Browse Files
- feature: 销售线索bug修复 · e51000ae
  songyinghui authored Dec 07, 2023
  
  e51000ae Browse Files
- Merge branch 'feature-wm' into developer · 8275abde
  songyinghui authored Dec 07, 2023
  
  8275abde Browse Files
- feature: 销售线索佣金 · cc8e1ffd
  songyinghui authored Dec 07, 2023
  
  cc8e1ffd Browse Files
- Merge branch 'feature-wm' into developer · 21a46f1a
  songyinghui authored Dec 07, 2023
  
  21a46f1a Browse Files
- feature: 微盟订单 · 34ff30d3
  songyinghui authored Dec 07, 2023
  
  34ff30d3 Browse Files
- Merge branch 'feature-wm' into developer · 18ec6fd3
  songyinghui authored Dec 07, 2023
  
  18ec6fd3 Browse Files
- feature: 日志打印 · fac34f47
  songyinghui authored Dec 07, 2023
  
  fac34f47 Browse Files
- Merge branch 'feature-wm' into developer · e320cc94
  songyinghui authored Dec 07, 2023
  
  e320cc94 Browse Files
- feature: 微盟订单 · bbd43db4
  songyinghui authored Dec 07, 2023
  
  bbd43db4 Browse Files
06 Dec, 2023 2 commits
- Merge branch 'feature-wm' into developer · 0b1f15b0
  songyinghui authored Dec 06, 2023
  
  0b1f15b0 Browse Files
- feature: 销售线索数据组 · f075a34a
  songyinghui authored Dec 06, 2023
  
  f075a34a Browse Files
03 Dec, 2023 5 commits
- Merge branch 'feature-2023-11-cloud' into 'master' · 2d7d5fe7
```
Feature 2023 11 cloud

See merge request !1577
```
  guojx authored Dec 03, 2023
  2d7d5fe7 Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · c033f892
```
是否是分页接口判断不了，调整

See merge request !1576
```
  guojx authored Dec 03, 2023
  c033f892 Browse Files
- 是否是分页接口判断不了，调整 · 1107dc9c
  guojx authored Dec 03, 2023
  
  1107dc9c Browse Files
- Merge branch 'feature-2023-11-cloud' into 'developer' · 65ab4f5f
```
数据接口超过90天调整名称

See merge request !1575
```
  guojx authored Dec 03, 2023
  65ab4f5f Browse Files
- 数据接口超过90天调整名称 · 1ae23861
  guojx authored Dec 03, 2023
  
  1ae23861 Browse Files
01 Dec, 2023 3 commits
- Merge branch 'bugfix-20231201' into 'developer' · 8f7e4676
```
Bugfix 20231201

See merge request !1574
```
  王祖波 authored Dec 01, 2023
  8f7e4676 Browse Files
- Merge branch 'bugfix-20231201' into 'master' · ac231f53
```
转化器回滚

See merge request !1573
```
  王祖波 authored Dec 01, 2023
  ac231f53 Browse Files
- 转化器回滚 · b88c441b
  王祖波 authored Dec 01, 2023
  
  b88c441b Browse Files