Commits · 7bb5696e128816ecf2148f5967d2bc25a52d2ba2 · haoban3.0 / haoban-manage3.0 · GitLab

28 Oct, 2023 4 commits
- 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 17 commits
- 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
- 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