Commits · 33fe8200efc2b8fc90cb5917bc278bdb2fbf4319 · haoban3.0 / haoban-manage3.0 · GitLab

03 Nov, 2023 2 commits
- Merge branch 'feature-content5' into developer · 33fe8200
  王祖波 authored Nov 03, 2023
  
  33fe8200 Browse Files
- 导出视频修改 · 0cd1402f
  王祖波 authored Nov 03, 2023
  
  0cd1402f Browse Files
01 Nov, 2023 4 commits
- Merge branch 'bugfix-xgh-1101' into 'developer' · c026c642
```
群活码-无群主

See merge request !1495
```
  徐高华 authored Nov 01, 2023
  c026c642 Browse Files
- 群活码-无群主 · f1f6954d
  徐高华 authored Nov 01, 2023
  
  f1f6954d Browse Files
- Merge branch 'feature-content5' into developer · af0aba25
  songyinghui authored Nov 01, 2023
  
  af0aba25 Browse Files
- feature: 账号列表 · bab742e3
  songyinghui authored Nov 01, 2023
  
  bab742e3 Browse Files
31 Oct, 2023 7 commits
- Merge branch 'feature-content5' into developer · c415735b
  songyinghui authored Oct 31, 2023
  
  c415735b Browse Files
- feature: 账户数据 · 0757de97
  songyinghui authored Oct 31, 2023
  
  0757de97 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 77a42885
  王祖波 authored Oct 31, 2023
  
  77a42885 Browse Files
- Merge branch 'feature-content4-2' into developer · 4eb8c0ca
  王祖波 authored Oct 31, 2023
  
  4eb8c0ca Browse Files
- 权限 · 51d38d7a
  王祖波 authored Oct 31, 2023
  
  51d38d7a Browse Files
- feature: 二维码调整 · 072d1b7f
  songyinghui authored Oct 31, 2023
  
  072d1b7f Browse Files
- feature: 二维码调整 · 64e20f30
  songyinghui authored Oct 31, 2023
  
  64e20f30 Browse Files
30 Oct, 2023 26 commits
- Merge branch 'feature/202310月零散迭代' into 'developer' · 24c61209
```
退群统计

See merge request !1494
```
  徐高华 authored Oct 31, 2023
  24c61209 Browse Files
- 退群统计 · 29514c17
  徐高华 authored Oct 31, 2023
  
  29514c17 Browse Files
- Merge branch 'feature/202310月零散迭代' into 'developer' · f6bd468e
```
退群门店

See merge request !1493
```
  徐高华 authored Oct 30, 2023
  f6bd468e Browse Files
- 退群门店 · 41a33f21
  徐高华 authored Oct 30, 2023
  
  41a33f21 Browse Files
- 退群门店 · 38fe83db
  徐高华 authored Oct 30, 2023
  
  38fe83db Browse Files
- Merge branch 'feature-content5' into developer · 758ba9f2
  王祖波 authored Oct 30, 2023
  
  758ba9f2 Browse Files
- 导出视频 · cd094704
  王祖波 authored Oct 30, 2023
  
  cd094704 Browse Files
- Merge branch 'feature/202310月零散迭代' into 'developer' · 460e4d36
```
退群门店

See merge request !1492
```
  徐高华 authored Oct 30, 2023
  460e4d36 Browse Files
- 退群门店 · efdb4c5d
  徐高华 authored Oct 30, 2023
  
  efdb4c5d Browse Files
- Merge branch 'feature/202310月零散迭代' into 'developer' · 87761b08
```
退群门店

See merge request !1491
```
  徐高华 authored Oct 30, 2023
  87761b08 Browse Files
- 退群门店 · b2ed7657
  徐高华 authored Oct 30, 2023
  
  b2ed7657 Browse Files
- Merge branch 'feature-content5' of git.gicdev.com:haoban3.0/haoban-manage3.0 into feature-content5 · 7f3fe898
  songyinghui authored Oct 30, 2023
  
  7f3fe898 Browse Files
- feature: 内容5期 · d0b76f76
  songyinghui authored Oct 30, 2023
  
  d0b76f76 Browse Files
- Merge branch 'feature-content5' into developer · ad916b2c
  王祖波 authored Oct 30, 2023
  
  ad916b2c Browse Files
- 获取剩余资源 · c9f8299b
  王祖波 authored Oct 30, 2023
  
  c9f8299b Browse Files
- Merge branch 'feature-content5' into developer · 3c72c203
  songyinghui authored Oct 30, 2023
  
  3c72c203 Browse Files
- feature: 好办视频空间 · 8941f4d9
  songyinghui authored Oct 30, 2023
  
  8941f4d9 Browse Files
- feature: 好办授权接口 · ca3f71b1
  songyinghui authored Oct 30, 2023
  
  ca3f71b1 Browse Files
- feature: 视频空间 · b7ff4b9c
  songyinghui authored Oct 30, 2023
  
  b7ff4b9c Browse Files
- Merge branch 'developer' of git.gicdev.com:haoban3.0/haoban-manage3.0 into developer · 6bee972b
  songyinghui authored Oct 30, 2023
  
  6bee972b Browse Files
- Merge branch 'feature-content5' into developer · 20ad5f37
  songyinghui authored Oct 30, 2023
  
  20ad5f37 Browse Files
- Merge branch 'feature-content4-2' into developer · 39e04965
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
```
  王祖波 authored Oct 30, 2023
  39e04965 Browse Files
- 默认权限 · 6c3294a1
  王祖波 authored Oct 30, 2023
  
  6c3294a1 Browse Files
- Merge branch 'master' into feature-content4-2 · f14bd76b
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
```
  王祖波 authored Oct 30, 2023
  f14bd76b Browse Files
- Merge branch 'feature-content4-2' into developer · 34dcbed2
  王祖波 authored Oct 30, 2023
  
  34dcbed2 Browse Files
- 回退 · e01b3c26
  王祖波 authored Oct 30, 2023
  
  e01b3c26 Browse Files
29 Oct, 2023 1 commit
- test · bf5a089d
  王祖波 authored Oct 29, 2023
  
  bf5a089d Browse Files