Commits · 32f2d2baed0b278279fa1966c948b5db4a237164 · haoban3.0 / haoban-manage3.0 · GitLab

13 Dec, 2022 2 commits
- Merge branch 'feature-content-pro' into developer · 32f2d2ba
  王祖波 authored Dec 13, 2022
  
  32f2d2ba Browse Files
- 过滤无素材栏目 · 42571bd1
  王祖波 authored Dec 13, 2022
  
  42571bd1 Browse Files
12 Dec, 2022 35 commits
- Merge branch 'feature/社群' into 'developer' · 3bf2faf0
```
任务

See merge request !609
```
  徐高华 authored Dec 12, 2022
  3bf2faf0 Browse Files
- 任务 · a49e8672
  徐高华 authored Dec 12, 2022
  
  a49e8672 Browse Files
- Merge branch 'feature/社群' into 'developer' · cbcd026a
```
Feature/社群

See merge request !608
```
  徐高华 authored Dec 12, 2022
  cbcd026a Browse Files
- 完成代办 · 832d0b42
  徐高华 authored Dec 12, 2022
  
  832d0b42 Browse Files
- 代办 · 0ad53210
  徐高华 authored Dec 12, 2022
  
  0ad53210 Browse Files
- Merge branch 'feature/社群' into 'developer' · e150313d
```
计划详情

See merge request !607
```
  徐高华 authored Dec 12, 2022
  e150313d Browse Files
- 计划详情 · caee4bbf
  徐高华 authored Dec 12, 2022
  
  caee4bbf Browse Files
- Merge branch 'feature/社群' into 'developer' · bb94695e
```
好办小程序群发

See merge request !606
```
  徐高华 authored Dec 12, 2022
  bb94695e Browse Files
- 好办小程序群发 · 3a446bfb
  徐高华 authored Dec 12, 2022
  
  3a446bfb Browse Files
- Merge branch 'feature/社群' into 'developer' · af3660b8
```
sql

See merge request !605
```
  徐高华 authored Dec 12, 2022
  af3660b8 Browse Files
- sql · 220882b9
  徐高华 authored Dec 12, 2022
  
  220882b9 Browse Files
- Merge branch 'feature/社群' into 'developer' · 96a2b437
```
test

See merge request !604
```
  徐高华 authored Dec 12, 2022
  96a2b437 Browse Files
- test · 80b6019e
  徐高华 authored Dec 12, 2022
  
  80b6019e Browse Files
- Merge branch 'feature/社群' into 'developer' · 63293183
```
Feature/社群

See merge request !603
```
  徐高华 authored Dec 12, 2022
  63293183 Browse Files
- 群发 · 6696f427
  徐高华 authored Dec 12, 2022
  
  6696f427 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · e662032b
  zzd authored Dec 12, 2022
  
  e662032b Browse Files
- Merge branch 'feature-offline-activity' into developer · def63164
  zzd authored Dec 12, 2022
  
  def63164 Browse Files
- 线下预约 · 028a59eb
  zzd authored Dec 12, 2022
  
  028a59eb Browse Files
- 商户认领 · c146ff3c
  徐高华 authored Dec 12, 2022
  
  c146ff3c Browse Files
- Merge branch 'feature/社群' into 'developer' · 5924b76c
```
api

See merge request !602
```
  徐高华 authored Dec 12, 2022
  5924b76c Browse Files
- api · 518ef7b7
  徐高华 authored Dec 12, 2022
  
  518ef7b7 Browse Files
- Merge branch 'feature/社群' into 'developer' · a007d193
```
群

See merge request !601
```
  徐高华 authored Dec 12, 2022
  a007d193 Browse Files
- 群 · 36902ef5
  徐高华 authored Dec 12, 2022
  
  36902ef5 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · f67e9a11
  zzd authored Dec 12, 2022
  
  f67e9a11 Browse Files
- Merge branch 'feature-offline-activity' into developer · e3d0d46f
  zzd authored Dec 12, 2022
  
  e3d0d46f Browse Files
- 线下预约 · c6396f9c
  zzd authored Dec 12, 2022
  
  c6396f9c Browse Files
- Merge remote-tracking branch 'origin/xgh_内容中台' · 3936d81d
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java
```
  徐高华 authored Dec 12, 2022
  3936d81d Browse Files
- Merge branch 'feature/社群' into 'developer' · 8fd04d64
```
Feature/社群

See merge request !599
```
  徐高华 authored Dec 12, 2022
  8fd04d64 Browse Files
- 群发 · a94dc9ba
  徐高华 authored Dec 12, 2022
  
  a94dc9ba Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 17025530
  zzd authored Dec 12, 2022
  
  17025530 Browse Files
- Merge branch 'feature-offline-activity' into developer · 72ebae55
  zzd authored Dec 12, 2022
  
  72ebae55 Browse Files
- 线下预约 · 74327e24
  zzd authored Dec 12, 2022
  
  74327e24 Browse Files
- 下载 · f325a40c
  徐高华 authored Dec 12, 2022
  
  f325a40c Browse Files
- Merge branch 'feature/社群' into 'developer' · 2f100e0f
```
群发终止

See merge request !598
```
  徐高华 authored Dec 12, 2022
  2f100e0f Browse Files
- 群发终止 · 30437faa
  徐高华 authored Dec 12, 2022
  
  30437faa Browse Files
11 Dec, 2022 3 commits
- Merge branch 'feature/社群' into 'developer' · 8dd3f6b9
```
链接数

See merge request !597
```
  徐高华 authored Dec 11, 2022
  8dd3f6b9 Browse Files
- 链接数 · d8e82cbb
  徐高华 authored Dec 11, 2022
  
  d8e82cbb Browse Files
- Merge branch 'feature/社群' into 'developer' · 8a5b37da
```
链接数

See merge request !596
```
  徐高华 authored Dec 11, 2022
  8a5b37da Browse Files