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

22 Dec, 2023 2 commits
- Merge branch 'bugfix/xgh1212' into test_branch · e32f1302
  root authored Dec 22, 2023
  
  e32f1302 Browse Files
- 新增素材时记录导购名称 · 888075b8
  徐高华 authored Dec 22, 2023
  
  888075b8 Browse Files
19 Dec, 2023 8 commits
- Merge branch 'bugfix_20231219_weimo_order' into test_branch · 9c7c333a
  root authored Dec 19, 2023
  
  9c7c333a Browse Files
- feature: 微盟销售线索校验是否有内容权限 · e9fdc6dd
  songyinghui authored Dec 19, 2023
  
  e9fdc6dd Browse Files
- Merge branch 'bugfix_20231219_weimo_order' into test_branch · 9f807438
  root authored Dec 19, 2023
  
  9f807438 Browse Files
- feature: 微盟订单销售线索调整重试次数，放大重试时间 · e39f7d9a
  songyinghui authored Dec 19, 2023
  
  e39f7d9a Browse Files
- Merge branch 'bugfix_20231219_weimo_order' into test_branch · 7979c0da
  root authored Dec 19, 2023
  
  7979c0da Browse Files
- feature: 企业维度过滤 · b6326cc3
  songyinghui authored Dec 19, 2023
  
  b6326cc3 Browse Files
- Merge branch 'bugfix_20231219_weimo_order' into test_branch · 457dfc40
  root authored Dec 19, 2023
  
  457dfc40 Browse Files
- feature: 企业维度的订单过滤 · bc274c67
  songyinghui authored Dec 19, 2023
  
  bc274c67 Browse Files
18 Dec, 2023 5 commits
- Merge branch 'feature-wm' into 'master' · c414f462
```
Feature wm

See merge request !1587
```
  songyinghui authored Dec 18, 2023
  c414f462 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
- feature: 忽略订单 · 8eee6fe9
  songyinghui authored Dec 18, 2023
  
  8eee6fe9 Browse Files
- feature: 字段缺失 · ae4ddb0c
  songyinghui authored Dec 18, 2023
  
  ae4ddb0c Browse Files
14 Dec, 2023 7 commits
- Merge branch 'bugfix_20231214' into 'master' · f6f42577
```
feature: 销售线索生命周期

See merge request !1585
```
  songyinghui authored Dec 14, 2023
  f6f42577 Browse Files
- feature: 销售线索生命周期 · 17fd9c6b
  songyinghui authored Dec 14, 2023
  
  17fd9c6b Browse Files
- Merge branch 'bugfix/xgh1212' into test_branch · d172bb92
  root authored Dec 14, 2023
  
  d172bb92 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 4 commits
- Merge branch 'bugfix-2023-12-13-data' into 'master' · 814d91cf
```
回退3个月接口调用区分代码

See merge request !1581
```
  guojx authored Dec 13, 2023
  814d91cf Browse Files
- feature: 订单纬度审核素材字段 · 3f5f0216
  songyinghui authored Dec 13, 2023
  
  3f5f0216 Browse Files
- Merge branch 'bugfix-2023-12-13-data' into test_branch · c9e1589e
  root authored Dec 13, 2023
  
  c9e1589e Browse Files
- 回退3个月接口调用区分代码 · b549de9e
  guojx authored Dec 13, 2023
  
  b549de9e Browse Files
12 Dec, 2023 7 commits
- Merge branch 'test_branch' of git.gicdev.com:haoban3.0/haoban-manage3.0 into test_branch · 5ee30072
  songyinghui authored Dec 12, 2023
  
  5ee30072 Browse Files
- feature: 和代码 · 0fb106ea
  songyinghui authored Dec 12, 2023
  
  0fb106ea Browse Files
- Merge branch 'feature-wm' into test_branch · eaabb4e3
```
# Conflicts:
#	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
```
  王祖波 authored Dec 12, 2023
  eaabb4e3 Browse Files
- Merge branch 'bugfix/xgh1212' into test_branch · 74f21591
  root authored Dec 12, 2023
  
  74f21591 Browse Files
- Merge branch 'feature-wm' into test_branch · 25b6edda
  songyinghui authored Dec 12, 2023
  
  25b6edda Browse Files
- 美邦延迟处理 · 7338f2fd
  徐高华 authored Dec 12, 2023
  
  7338f2fd Browse Files
- 拆分队列 · f764f5d5
  徐高华 authored Dec 12, 2023
  
  f764f5d5 Browse Files
08 Dec, 2023 2 commits
- feature: 会员订单写数据组 · bb8d9b7b
  songyinghui authored Dec 08, 2023
  
  bb8d9b7b Browse Files
- feature: 会员订单写数据组 · 13a74be4
  songyinghui authored Dec 08, 2023
  
  13a74be4 Browse Files
07 Dec, 2023 5 commits
- feature: 销售线索bug修复 · e51000ae
  songyinghui authored Dec 07, 2023
  
  e51000ae Browse Files
- feature: 销售线索佣金 · cc8e1ffd
  songyinghui authored Dec 07, 2023
  
  cc8e1ffd Browse Files
- feature: 微盟订单 · 34ff30d3
  songyinghui authored Dec 07, 2023
  
  34ff30d3 Browse Files
- feature: 日志打印 · fac34f47
  songyinghui authored Dec 07, 2023
  
  fac34f47 Browse Files
- feature: 微盟订单 · bbd43db4
  songyinghui authored Dec 07, 2023
  
  bbd43db4 Browse Files