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

15 Jan, 2024 4 commits
- Merge branch 'feature-wm-data' into 'master' · ada17731
```
Feature wm data

See merge request !1622
```
  songyinghui authored Jan 15, 2024
  ada17731 Browse Files
- Merge remote-tracking branch 'origin/master' into feature-wm-data · 1ab951b6
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/InteractRecordApiServiceImpl.java
```
  songyinghui authored Jan 15, 2024
  1ab951b6 Browse Files
- Merge branch 'feature/xgh/20241月迭代' into 'master' · bf1fb41d
```
Feature/xgh/20241月迭代

See merge request !1621
```
  徐高华 authored Jan 15, 2024
  bf1fb41d Browse Files
- 不保存member_unionid表 · 384ab49c
  徐高华 authored Jan 15, 2024
  
  384ab49c Browse Files
12 Jan, 2024 3 commits
- feature: 销售线索字段 · e5f4054a
  songyinghui authored Jan 12, 2024
  
  e5f4054a Browse Files
- 查询会员的好友导购 · 21b4d749
  徐高华 authored Jan 12, 2024
  
  21b4d749 Browse Files
- 查询会员的好友导购 · cbddf1e7
  徐高华 authored Jan 12, 2024
  
  cbddf1e7 Browse Files
11 Jan, 2024 2 commits
- Merge branch 'feature/订阅消息调整' into 'master' · feebecd9
```
去掉渠道

See merge request !1618
```
  徐高华 authored Jan 11, 2024
  feebecd9 Browse Files
- 去掉渠道 · 2933892d
  徐高华 authored Jan 11, 2024
  
  2933892d Browse Files
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 3 commits
- 赛区列表接口完善 · da2f810a
  guojx authored Jan 05, 2024
  
  da2f810a Browse Files
- 赛区列表接口完善 · 4bb5d169
  guojx authored Jan 05, 2024
  
  4bb5d169 Browse Files
- feature: 好办内容配置 · 57d08859
  songyinghui authored Jan 05, 2024
  
  57d08859 Browse Files
04 Jan, 2024 3 commits
- feature: 订单转化 · c998fd9f
  songyinghui authored Jan 04, 2024
  
  c998fd9f Browse Files
- 年补齐 · 16ee9d3a
  guojx authored Jan 04, 2024
  
  16ee9d3a Browse Files
- 门店pk榜单接口不需要传门店id参数 · 3704404d
  guojx authored Jan 04, 2024
  
  3704404d Browse Files
02 Jan, 2024 1 commit
- feature: 自定义时间 · 1e8476bb
  songyinghui authored Jan 02, 2024
  
  1e8476bb 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 6 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
- feature: 内容数据部分 · 9dab2b03
  songyinghui authored Dec 26, 2023
  
  9dab2b03 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