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

10 Jan, 2024 2 commits
- Merge branch 'feature/订阅消息调整' into 'master' · e0001ff6
```
会员合并删除

See merge request !1616
```
  徐高华 authored Jan 10, 2024
  e0001ff6 Browse Files
- 会员合并删除 · 908a4c99
  徐高华 authored Jan 10, 2024
  
  908a4c99 Browse Files
09 Jan, 2024 4 commits
- Merge branch 'feature-2023-12-data-rank' into 'master' · 6ea00e32
```
如果是前端传了门店id参数，则用前端的

See merge request !1613
```
  guojx authored Jan 09, 2024
  6ea00e32 Browse Files
- 如果是前端传了门店id参数，则用前端的 · f3083aff
  guojx authored Jan 09, 2024
  
  f3083aff Browse Files
- Merge branch 'feature-2023-12-data-rank' into 'master' · b2c1062c
```
Feature 2023 12 data rank

See merge request !1611
```
  guojx authored Jan 09, 2024
  b2c1062c Browse Files
- Merge branch 'feature/订阅消息调整' · 8663e7d1
```
# 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 Jan 09, 2024
  8663e7d1 Browse Files
05 Jan, 2024 2 commits
- 赛区列表接口完善 · da2f810a
  guojx authored Jan 05, 2024
  
  da2f810a Browse Files
- 赛区列表接口完善 · 4bb5d169
  guojx authored Jan 05, 2024
  
  4bb5d169 Browse Files
04 Jan, 2024 2 commits
- 年补齐 · 16ee9d3a
  guojx authored Jan 04, 2024
  
  16ee9d3a Browse Files
- 门店pk榜单接口不需要传门店id参数 · 3704404d
  guojx authored Jan 04, 2024
  
  3704404d Browse Files
29 Dec, 2023 6 commits
- 离职导购 · a597ab93
  guojx authored Dec 29, 2023
  
  a597ab93 Browse Files
- 查询字段名称调整 · 92bc7d98
  guojx authored Dec 29, 2023
  
  92bc7d98 Browse Files
- 获取销售和会员的导购列表数据 · 12399da6
  guojx authored Dec 29, 2023
  
  12399da6 Browse Files
- 企业竞赛单项 · 8eebc161
  guojx authored Dec 29, 2023
  
  8eebc161 Browse Files
- 竞赛单项和赛区接口 · ac858c38
  guojx authored Dec 29, 2023
  
  ac858c38 Browse Files
- 竞赛单项和赛区接口 · 456bf364
  guojx authored Dec 29, 2023
  
  456bf364 Browse Files
28 Dec, 2023 3 commits
- 会员合并 · 95877b53
  徐高华 authored Dec 28, 2023
  
  95877b53 Browse Files
- 竞赛单项和赛区接口 · a9cc3de4
  guojx authored Dec 28, 2023
  
  a9cc3de4 Browse Files
- 竞赛单项和赛区接口 · 15988601
  guojx authored Dec 28, 2023
  
  15988601 Browse Files
26 Dec, 2023 5 commits
- 合计名称赋予 · f127c67f
  guojx authored Dec 26, 2023
  
  f127c67f Browse Files
- 销售结构接口四舍五入 · 14841f6c
  guojx authored Dec 26, 2023
  
  14841f6c Browse Files
- 销售结构接口 · 541e92a2
  guojx authored Dec 26, 2023
  
  541e92a2 Browse Files
- 销售结构接口 · 5ced7b56
  guojx authored Dec 26, 2023
  
  5ced7b56 Browse Files
- Merge branch 'bugfix/xgh1212' into 'master' · f757a0b4
```
log

See merge request !1596
```
  徐高华 authored Dec 26, 2023
  f757a0b4 Browse Files
25 Dec, 2023 3 commits
- Merge branch 'bugfix-20231225' into 'master' · c004b49c
```
企微接口1000批次发送

See merge request !1595
```
  王祖波 authored Dec 25, 2023
  c004b49c Browse Files
- 企微接口1000批次发送 · 78b4359a
  王祖波 authored Dec 25, 2023
  
  78b4359a Browse Files
- log · 23d7d964
  徐高华 authored Dec 25, 2023
  
  23d7d964 Browse Files
22 Dec, 2023 2 commits
- Merge branch 'bugfix/xgh1212' into 'master' · 1b810b1a
```
新增素材时记录导购名称

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

See merge request !1590
```
  songyinghui authored Dec 19, 2023
  7003ad86 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
- 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
- feature: 企业维度过滤 · b6326cc3
  songyinghui authored Dec 19, 2023
  
  b6326cc3 Browse Files
- feature: 企业维度的订单过滤 · bc274c67
  songyinghui authored Dec 19, 2023
  
  bc274c67 Browse Files
18 Dec, 2023 4 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