Commits · 5a7538e8c3814383e3408fbbd653a80fa0fefefa · haoban3.0 / haoban-manage3.0 · GitLab

26 Oct, 2023 7 commits
- Merge remote-tracking branch 'origin/developer' into developer · 5a7538e8
  王祖波 authored Oct 26, 2023
  
  5a7538e8 Browse Files
- Merge branch 'feature-content5' into developer · 977fa184
  王祖波 authored Oct 26, 2023
  
  977fa184 Browse Files
- stream test · ed8ea2c1
  王祖波 authored Oct 26, 2023
  
  ed8ea2c1 Browse Files
- Merge branch 'feature-content5' into 'developer' · 43ab74ad
```
@ResponseBody

See merge request !1483
```
  王祖波 authored Oct 26, 2023
  43ab74ad Browse Files
- @ResponseBody · cc679c41
  王祖波 authored Oct 26, 2023
  
  cc679c41 Browse Files
- Merge branch 'feature-content5' into developer · c1b1551b
```
# Conflicts:
#	haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
```
  王祖波 authored Oct 26, 2023
  c1b1551b Browse Files
- 内容模板、消息 · 406718b1
  王祖波 authored Oct 26, 2023
  
  406718b1 Browse Files
19 Oct, 2023 3 commits
- Merge branch 'feature-content4-3' into 'master' · 1595a409
```
Feature content4 3

See merge request !1482
```
  songyinghui authored Oct 19, 2023
  1595a409 Browse Files
- Merge branch 'feature-202309-数据组队列迁移' into feature-content4-3 · df56af4f
  songyinghui authored Oct 19, 2023
  
  df56af4f Browse Files
- Merge remote-tracking branch 'origin/master' into feature-content4-3 · 09c79440
  songyinghui authored Oct 19, 2023
  
  09c79440 Browse Files
18 Oct, 2023 2 commits
- Merge branch 'feature-content4-3' into developer · a6f72668
  songyinghui authored Oct 18, 2023
  
  a6f72668 Browse Files
- feature: 评论用户头像 · 7eef80bd
  songyinghui authored Oct 18, 2023
  
  7eef80bd Browse Files
17 Oct, 2023 6 commits
- Merge branch 'master-调整队列' into 'master' · c1cf7d20
```
限制导出周期

See merge request !1481
```
  徐高华 authored Oct 17, 2023
  c1cf7d20 Browse Files
- Merge branch 'master-调整队列' into 'developer' · 9fa4c66b
```
限制导出周期

See merge request !1480
```
  徐高华 authored Oct 17, 2023
  9fa4c66b Browse Files
- 限制导出周期 · 754a032f
  徐高华 authored Oct 17, 2023
  
  754a032f Browse Files
- Merge branch 'developer' of git.gicdev.com:haoban3.0/haoban-manage3.0 into developer · 4b61bafc
  songyinghui authored Oct 17, 2023
  
  4b61bafc Browse Files
- 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
12 Oct, 2023 6 commits
- Merge branch 'master-调整队列' into 'developer' · d5815f4b
```
队列延时10秒

See merge request !1479
```
  徐高华 authored Oct 12, 2023
  d5815f4b Browse Files
- Merge branch 'master-调整队列' into 'master' · 1a9de2ef
```
队列延时10秒

See merge request !1478
```
  徐高华 authored Oct 12, 2023
  1a9de2ef Browse Files
- 队列延时10秒 · fb0b1656
  徐高华 authored Oct 12, 2023
  
  fb0b1656 Browse Files
- Merge branch 'master-调整队列' into developer · 34a3a57f
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
```
  徐高华 authored Oct 12, 2023
  34a3a57f Browse Files
- Merge branch 'master-调整队列' into 'master' · 17146b38
```
队列延时10秒

See merge request !1476
```
  徐高华 authored Oct 12, 2023
  17146b38 Browse Files
- 队列延时10秒 · 9a790f77
  徐高华 authored Oct 12, 2023
  
  9a790f77 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 6 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
- Merge branch 'master-调整队列' into 'master' · f355a5c9
```
Master 调整队列

See merge request !1474
```
  徐高华 authored Oct 10, 2023
  f355a5c9 Browse Files
- feature: 知识库历史商户菜单 · 6e8e0742
  songyinghui authored Oct 10, 2023
  
  6e8e0742 Browse Files
09 Oct, 2023 4 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