Commits · eb8d68a556b5c8a38f144f4b38202b7ecabf8c5e · haoban3.0 / haoban-manage3.0 · GitLab

26 Dec, 2023 1 commit
- 销售结构接口 · eb8d68a5
```
(cherry picked from commit 5ced7b56)
```
  guojx authored Dec 26, 2023
  eb8d68a5 Browse Files
25 Dec, 2023 4 commits
- Merge branch 'bugfix-20231225' into 'developer' · a0d2ac63
```
Bugfix 20231225

See merge request !1594
```
  王祖波 authored Dec 25, 2023
  a0d2ac63 Browse Files
- 企微接口1000批次发送 · 78b4359a
  王祖波 authored Dec 25, 2023
  
  78b4359a Browse Files
- Merge branch 'bugfix/xgh1212' into 'developer' · 6154037b
```
log

See merge request !1593
```
  徐高华 authored Dec 25, 2023
  6154037b Browse Files
- log · 23d7d964
  徐高华 authored Dec 25, 2023
  
  23d7d964 Browse Files
22 Dec, 2023 3 commits
- Merge branch 'bugfix/xgh1212' into 'master' · 1b810b1a
```
新增素材时记录导购名称

See merge request !1592
```
  徐高华 authored Dec 22, 2023
  1b810b1a Browse Files
- Merge branch 'bugfix/xgh1212' into 'developer' · 8a82c917
```
新增素材时记录导购名称

See merge request !1591
```
  徐高华 authored Dec 22, 2023
  8a82c917 Browse Files
- 新增素材时记录导购名称 · 888075b8
  徐高华 authored Dec 22, 2023
  
  888075b8 Browse Files
19 Dec, 2023 11 commits
- Merge branch 'bugfix_20231219_weimo_order' into 'master' · 7003ad86
```
feature: 微盟销售线索 校验是否有内容权限

See merge request !1590
```
  songyinghui authored Dec 19, 2023
  7003ad86 Browse Files
- Merge branch 'bugfix_20231219_weimo_order' into developer · 81ddf875
  songyinghui authored Dec 19, 2023
  
  81ddf875 Browse Files
- feature: 微盟销售线索校验是否有内容权限 · e9fdc6dd
  songyinghui authored Dec 19, 2023
  
  e9fdc6dd Browse Files
- Merge branch 'bugfix_20231219_weimo_order' into 'master' · 30e9627a
```
feature: 微盟订单销售线索 调整重试次数，放大重试时间

See merge request !1589
```
  songyinghui authored Dec 19, 2023
  30e9627a Browse Files
- Merge branch 'bugfix_20231219_weimo_order' into developer · cd08f8b0
  songyinghui authored Dec 19, 2023
  
  cd08f8b0 Browse Files
- feature: 微盟订单销售线索调整重试次数，放大重试时间 · e39f7d9a
  songyinghui authored Dec 19, 2023
  
  e39f7d9a Browse Files
- Merge branch 'bugfix_20231219_weimo_order' into 'master' · 72573685
```
Bugfix 20231219 weimo order

See merge request !1588
```
  songyinghui authored Dec 19, 2023
  72573685 Browse Files
- Merge branch 'bugfix_20231219_weimo_order' into developer · a0bf0877
  songyinghui authored Dec 19, 2023
  
  a0bf0877 Browse Files
- feature: 企业维度过滤 · b6326cc3
  songyinghui authored Dec 19, 2023
  
  b6326cc3 Browse Files
- Merge branch 'bugfix_20231219_weimo_order' into developer · a2f2ba96
  songyinghui authored Dec 19, 2023
  
  a2f2ba96 Browse Files
- feature: 企业维度的订单过滤 · bc274c67
  songyinghui authored Dec 19, 2023
  
  bc274c67 Browse Files
18 Dec, 2023 8 commits
- Merge branch 'feature-wm' into 'master' · c414f462
```
Feature wm

See merge request !1587
```
  songyinghui authored Dec 18, 2023
  c414f462 Browse Files
- Merge branch 'feature-wm' into developer · f9645ce6
```
# Conflicts:
#	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
```
  songyinghui authored Dec 18, 2023
  f9645ce6 Browse Files
- feature: 订单过滤 · 2bed5fe3
  songyinghui authored Dec 18, 2023
  
  2bed5fe3 Browse Files
- Merge remote-tracking branch 'origin/master' into feature-wm · 189ea04f
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/MessageConvertHelper.java
#	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
```
  songyinghui authored Dec 18, 2023
  189ea04f Browse Files
- Merge branch 'feature-wm' into developer · f61638e3
  songyinghui authored Dec 18, 2023
  
  f61638e3 Browse Files
- feature: 忽略订单 · 8eee6fe9
  songyinghui authored Dec 18, 2023
  
  8eee6fe9 Browse Files
- Merge branch 'feature-wm' into developer · 817a761e
  songyinghui authored Dec 18, 2023
  
  817a761e Browse Files
- feature: 字段缺失 · ae4ddb0c
  songyinghui authored Dec 18, 2023
  
  ae4ddb0c Browse Files
14 Dec, 2023 8 commits
- Merge branch 'bugfix_20231214' into 'master' · f6f42577
```
feature: 销售线索生命周期

See merge request !1585
```
  songyinghui authored Dec 14, 2023
  f6f42577 Browse Files
- 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