Commits · 3c72c203752b7776771bb26cf7f2cd818d2e756c · haoban3.0 / haoban-manage3.0 · GitLab

30 Oct, 2023 11 commits
- 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 5 commits
- test · bf5a089d
  王祖波 authored Oct 29, 2023
  
  bf5a089d Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 953914e0
  王祖波 authored Oct 29, 2023
  
  953914e0 Browse Files
- test · 65fab597
  王祖波 authored Oct 29, 2023
  
  65fab597 Browse Files
- Merge branch 'feature/202310月零散迭代' into 'developer' · 67eaef79
```
Feature/202310月零散迭代

See merge request !1489
```
  徐高华 authored Oct 29, 2023
  67eaef79 Browse Files
- feature: 导购端账号授权 · f8d8819c
  songyinghui authored Oct 29, 2023
  
  f8d8819c Browse Files
28 Oct, 2023 10 commits
- Merge branch 'feature-content4-2' into developer · 3e7b97b4
  王祖波 authored Oct 28, 2023
  
  3e7b97b4 Browse Files
- pom · ddd87bb2
  王祖波 authored Oct 28, 2023
  
  ddd87bb2 Browse Files
- Merge branch 'feature-content4-2' into developer · e4972e3d
  王祖波 authored Oct 28, 2023
  
  e4972e3d Browse Files
- pom · b5d02745
  王祖波 authored Oct 28, 2023
  
  b5d02745 Browse Files
- Merge branch 'feature-content4-2' into developer · fbbd74ce
  王祖波 authored Oct 28, 2023
  
  fbbd74ce Browse Files
- ai视频创作 · 52888ac3
  王祖波 authored Oct 28, 2023
  
  52888ac3 Browse Files
- Merge branch 'feature-content5' into developer · 7bb5696e
  王祖波 authored Oct 28, 2023
  
  7bb5696e Browse Files
- ai视频创作 · 5e369b3e
  王祖波 authored Oct 28, 2023
  
  5e369b3e Browse Files
- Merge branch 'feature-content4-2' into developer · 76cb843d
  王祖波 authored Oct 28, 2023
  
  76cb843d Browse Files
- openAi日志 · bd145392
  王祖波 authored Oct 28, 2023
  
  bd145392 Browse Files
27 Oct, 2023 2 commits
- Merge branch 'feature-content4-2' into developer · cf2ec92c
  王祖波 authored Oct 27, 2023
  
  cf2ec92c Browse Files
- openAi · c22b5381
  王祖波 authored Oct 27, 2023
  
  c22b5381 Browse Files
26 Oct, 2023 12 commits
- Merge branch 'master-调整队列' into 'master' · fd4201b2
```
Master 调整队列

See merge request !1488
```
  徐高华 authored Oct 26, 2023
  fd4201b2 Browse Files
- Merge branch 'master-调整队列' into 'developer' · d441220f
```
导购绑定

See merge request !1487
```
  徐高华 authored Oct 26, 2023
  d441220f Browse Files
- 导购绑定 · 9ad61dc7
  徐高华 authored Oct 26, 2023
  
  9ad61dc7 Browse Files
- Merge branch 'master-调整队列' into 'developer' · 8a25adf8
```
导购绑定

See merge request !1486
```
  徐高华 authored Oct 26, 2023
  8a25adf8 Browse Files
- 导购绑定 · 40a83fe4
  徐高华 authored Oct 26, 2023
  
  40a83fe4 Browse Files
- Merge branch 'master-调整队列' into 'developer' · b69fd23c
```
导购绑定

See merge request !1485
```
  徐高华 authored Oct 26, 2023
  b69fd23c Browse Files
- 导购绑定 · dd13c453
  徐高华 authored Oct 26, 2023
  
  dd13c453 Browse Files
- Merge branch 'master-调整队列' into 'developer' · c68e80a9
```
导购绑定

See merge request !1484
```
  徐高华 authored Oct 26, 2023
  c68e80a9 Browse Files
- 导购绑定 · b13cbb04
  徐高华 authored Oct 26, 2023
  
  b13cbb04 Browse Files
- Merge branch 'feature-content5' into developer · 9eb2b5ee
  王祖波 authored Oct 26, 2023
  
  9eb2b5ee Browse Files
- stream test · ea7f1271
  王祖波 authored Oct 26, 2023
  
  ea7f1271 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 5a7538e8
  王祖波 authored Oct 26, 2023
  
  5a7538e8 Browse Files