Commits · 7144c966a3fec1d0327b5ce40ea1d577c5b30a85 · haoban3.0 / haoban-manage3.0 · GitLab

17 Oct, 2023 2 commits
- Merge branch 'feature-content4-3' into developer · 7144c966
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
```
  songyinghui authored Oct 17, 2023
  7144c966 Browse Files
- feature: 好办权限初始化 · 8ce5d908
  songyinghui authored Oct 17, 2023
  
  8ce5d908 Browse Files
11 Oct, 2023 6 commits
- Merge branch 'feature-content4-3' into developer · 7cac5ea2
  songyinghui authored Oct 11, 2023
  
  7cac5ea2 Browse Files
- feature: 菜单权限初始化版本切换 · 1699b411
  songyinghui authored Oct 11, 2023
  
  1699b411 Browse Files
- feature: 菜单权限初始化 · c6dc0560
  songyinghui authored Oct 11, 2023
  
  c6dc0560 Browse Files
- Merge branch 'developer' of git.gicdev.com:haoban3.0/haoban-manage3.0 into developer · 2f791cf5
  songyinghui authored Oct 11, 2023
  
  2f791cf5 Browse Files
- Merge branch 'feature-content4-3' into developer · 639e1d7d
  songyinghui authored Oct 11, 2023
  
  639e1d7d Browse Files
- feature: 菜单权限初始化 · 4c42a79f
  songyinghui authored Oct 11, 2023
  
  4c42a79f Browse Files
10 Oct, 2023 5 commits
- Merge branch 'feature-content4-3' into 'developer' · f55a1ccd
```
导购知识库列表数据

See merge request !1475
```
  王祖波 authored Oct 10, 2023
  f55a1ccd Browse Files
- 导购知识库列表数据 · a06c6f29
  王祖波 authored Oct 10, 2023
  
  a06c6f29 Browse Files
- Merge branch 'feature-content4-3' into developer · 99e39608
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
```
  songyinghui authored Oct 10, 2023
  99e39608 Browse Files
- feature: 知识库数据统计 · 7510617c
  songyinghui authored Oct 10, 2023
  
  7510617c Browse Files
- feature: 知识库历史商户菜单 · 6e8e0742
  songyinghui authored Oct 10, 2023
  
  6e8e0742 Browse Files
09 Oct, 2023 12 commits
- Merge branch 'feature-content4-2' into developer · 6aec005a
  王祖波 authored Oct 09, 2023
  
  6aec005a Browse Files
- 好办初始化权限 · 01fa3118
  王祖波 authored Oct 09, 2023
  
  01fa3118 Browse Files
- Merge branch 'feature-content4-3' into developer · dd8f5ab1
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
```
  songyinghui authored Oct 09, 2023
  dd8f5ab1 Browse Files
- feature: 权限初始化 · 8a55b902
  songyinghui authored Oct 09, 2023
  
  8a55b902 Browse Files
- Merge branch 'feature-content4-3' into 'developer' · d9c9bf09
```
Feature content4 3

See merge request !1473
```
  王祖波 authored Oct 09, 2023
  d9c9bf09 Browse Files
- 素材额外信息 · 3bf4e7bc
  王祖波 authored Oct 09, 2023
  
  3bf4e7bc Browse Files
- Merge branch 'master-调整队列' into 'developer' · ca29b929
```
手动激活只查未激活状态的

See merge request !1472
```
  徐高华 authored Oct 09, 2023
  ca29b929 Browse Files
- 手动激活只查未激活状态的 · f92e25a5
  徐高华 authored Oct 09, 2023
  
  f92e25a5 Browse Files
- Merge branch 'feature-202309-数据组队列迁移' into developer · fa387fd3
  songyinghui authored Oct 09, 2023
  
  fa387fd3 Browse Files
- feature: 触达日志操作日志记录 · 1278c757
  songyinghui authored Oct 09, 2023
  
  1278c757 Browse Files
- Merge remote-tracking branch 'origin/master' into feature-202309-数据组队列迁移 · 11804589
  songyinghui authored Oct 09, 2023
  
  11804589 Browse Files
- feature: 默认不双写 · 753bc94b
  songyinghui authored Oct 09, 2023
  
  753bc94b Browse Files
08 Oct, 2023 5 commits
- feature: 数据兼容 · c14a412c
  songyinghui authored Oct 08, 2023
  
  c14a412c Browse Files
- Merge branch 'feature-content4-2' into developer · 8dca7371
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
```
  王祖波 authored Oct 08, 2023
  8dca7371 Browse Files
- 权限初始化 · f587c4ad
  王祖波 authored Oct 08, 2023
  
  f587c4ad Browse Files
- Merge branch 'feature-content4-3' into 'developer' · 95bf3cdb
```
素材详情发布时间

See merge request !1470
```
  王祖波 authored Oct 08, 2023
  95bf3cdb Browse Files
- 素材详情发布时间 · 5b3a35ab
  王祖波 authored Oct 08, 2023
  
  5b3a35ab Browse Files
07 Oct, 2023 10 commits
- Merge branch 'master-调整队列' into 'developer' · 2311a1f1
```
标签同步

See merge request !1468
```
  徐高华 authored Oct 07, 2023
  2311a1f1 Browse Files
- 标签同步 · 5bfeaf6a
  徐高华 authored Oct 07, 2023
  
  5bfeaf6a Browse Files
- Merge branch 'master-调整队列' into 'developer' · eb6c6513
```
Master 调整队列

See merge request !1467
```
  徐高华 authored Oct 07, 2023
  eb6c6513 Browse Files
- 标签同步 · 43bf1d61
  徐高华 authored Oct 07, 2023
  
  43bf1d61 Browse Files
- 标签同步 · 138644f4
  徐高华 authored Oct 07, 2023
  
  138644f4 Browse Files
- Merge branch 'master-调整队列' into 'developer' · d161c39c
```
Master 调整队列

See merge request !1466
```
  徐高华 authored Oct 07, 2023
  d161c39c Browse Files
- 标签同步 · 90c57853
  徐高华 authored Oct 07, 2023
  
  90c57853 Browse Files
- 标签同步 · 6fab5b6e
  徐高华 authored Oct 07, 2023
  
  6fab5b6e Browse Files
- Merge branch 'master-调整队列' into developer · 182a4e69
```
# Conflicts:
#	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java
```
  徐高华 authored Oct 07, 2023
  182a4e69 Browse Files
- 标签同步 · 0b65a9cb
  徐高华 authored Oct 07, 2023
  
  0b65a9cb Browse Files