Commits · 3068e636727959ae44595b4f0777fba382f40fc9 · haoban3.0 / haoban-manage3.0 · GitLab

20 Apr, 2023 10 commits
- Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer · 3068e636
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/LicenceOrderQDTO.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/licence/impl/LicenceOrderServiceImpl.java
#	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/LicenceOrderController.java
```
  jinxin authored Apr 20, 2023
  3068e636 Browse Files
- 新增订单接口调整 · cf0086c8
  jinxin authored Apr 20, 2023
  
  cf0086c8 Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 24c78868
```
自建-通讯录

See merge request !1171
```
  徐高华 authored Apr 20, 2023
  24c78868 Browse Files
- 自建-通讯录 · b2d22054
  徐高华 authored Apr 20, 2023
  
  b2d22054 Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 96c16639
```
Merge branch 'ferture/四月迭代需求' into 'feature/自建应用验证'

See merge request !1169
```
  徐高华 authored Apr 20, 2023
  96c16639 Browse Files
- Merge branch 'developer' of git.gicdev.com:haoban3.0/haoban-manage3.0 into developer · a2db29da
  songyinghui authored Apr 20, 2023
  
  a2db29da Browse Files
- feat: 周报月报还原 · a8051bb6
  songyinghui authored Apr 20, 2023
  
  a8051bb6 Browse Files
- Merge branch 'ferture/四月迭代需求' into 'feature/自建应用验证' · 46fcfda0
```
Ferture/四月迭代需求

See merge request !1168
```
  徐高华 authored Apr 20, 2023
  46fcfda0 Browse Files
- Merge branch 'ferture/四月迭代需求' into 'developer' · 2366ea7c
```
绑定主门店后刷新好友

See merge request !1167
```
  徐高华 authored Apr 20, 2023
  2366ea7c Browse Files
- 绑定主门店后刷新好友 · 52208592
  徐高华 authored Apr 20, 2023
  
  52208592 Browse Files
19 Apr, 2023 30 commits
- Merge branch 'feature-content2' into developer · 03a6959d
  songyinghui authored Apr 19, 2023
  
  03a6959d Browse Files
- feat: 客户触达日志队列延迟一分钟 · d64d9d3b
  songyinghui authored Apr 19, 2023
  
  d64d9d3b Browse Files
- feat: test · adb28434
  songyinghui authored Apr 19, 2023
  
  adb28434 Browse Files
- Merge branch 'feature-content2' into developer · 15649b00
  songyinghui authored Apr 19, 2023
  
  15649b00 Browse Files
- feat: 数据统计 · d77ccbdc
  songyinghui authored Apr 19, 2023
  
  d77ccbdc Browse Files
- feat: 数据统计 · ef0566dc
  songyinghui authored Apr 19, 2023
  
  ef0566dc Browse Files
- Merge branch 'feature-content2' into developer · 3aca0f10
  songyinghui authored Apr 19, 2023
  
  3aca0f10 Browse Files
- feat: 数据统计 · 8ba683a1
  songyinghui authored Apr 19, 2023
  
  8ba683a1 Browse Files
- feat: 门店信息查询 · 4c77a896
  songyinghui authored Apr 19, 2023
  
  4c77a896 Browse Files
- Merge branch 'feature-content2' into developer · d7232ada
  songyinghui authored Apr 19, 2023
  
  d7232ada Browse Files
- feat: 会员合并事件 · 92c58061
  songyinghui authored Apr 19, 2023
  
  92c58061 Browse Files
- Merge branch 'feature-content2' into developer · e2ab0afd
  songyinghui authored Apr 19, 2023
  
  e2ab0afd Browse Files
- feat: 门店信息 · 8bc8337f
  songyinghui authored Apr 19, 2023
  
  8bc8337f Browse Files
- Merge branch 'developer' of git.gicdev.com:haoban3.0/haoban-manage3.0 into developer · 0aae9c94
  songyinghui authored Apr 19, 2023
  
  0aae9c94 Browse Files
- Merge branch 'feature-content2' into developer · 8f9ad1f2
  songyinghui authored Apr 19, 2023
  
  8f9ad1f2 Browse Files
- feat: 排序 · e116424f
  songyinghui authored Apr 19, 2023
  
  e116424f Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 8b06d13c
```
自建

See merge request !1166
```
  徐高华 authored Apr 19, 2023
  8b06d13c Browse Files
- 自建 · 4319ea50
  徐高华 authored Apr 19, 2023
  
  4319ea50 Browse Files
- Merge branch 'feature-content2' into developer · 3339f704
  songyinghui authored Apr 19, 2023
  
  3339f704 Browse Files
- feat: 销售线索跳转 · 5d265c15
  songyinghui authored Apr 19, 2023
  
  5d265c15 Browse Files
- Merge remote-tracking branch 'origin/feature/自建应用验证' into developer · 60c49f8d
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
```
  徐高华 authored Apr 19, 2023
  60c49f8d Browse Files
- 自建 · a22a34f4
  徐高华 authored Apr 19, 2023
  
  a22a34f4 Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · 964afa0f
```
自建-活码

See merge request !1164
```
  徐高华 authored Apr 19, 2023
  964afa0f Browse Files
- 自建-活码 · 8c2aea9d
  徐高华 authored Apr 19, 2023
  
  8c2aea9d Browse Files
- Merge branch 'developer' of git.gicdev.com:haoban3.0/haoban-manage3.0 into developer · 3f6216ec
  songyinghui authored Apr 19, 2023
  
  3f6216ec Browse Files
- Merge branch 'feature-content2' into developer · 38091882
  songyinghui authored Apr 19, 2023
  
  38091882 Browse Files
- feat: 月报参数 · 61a50ef6
  songyinghui authored Apr 19, 2023
  
  61a50ef6 Browse Files
- Merge branch 'feature/自建应用验证' into 'developer' · cf2a1443
```
自建

See merge request !1163
```
  徐高华 authored Apr 19, 2023
  cf2a1443 Browse Files
- 自建 · 11f5fe7a
  徐高华 authored Apr 19, 2023
  
  11f5fe7a Browse Files
- Merge branch 'developer' of git.gicdev.com:haoban3.0/haoban-manage3.0 into developer · ad81ea8c
  songyinghui authored Apr 19, 2023
  
  ad81ea8c Browse Files