Commits · 877b9b11438000cd0083c62d71b3a444c625f944 · haoban3.0 / haoban-manage3.0

08 Oct, 2023 2 commits
- Merge branch 'feature-content4-3' into test_branch · 877b9b11
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java
```
  王祖波 authored Oct 08, 2023
  877b9b11 Browse Files
- 素材详情发布时间 · 5b3a35ab
  王祖波 authored Oct 08, 2023
  
  5b3a35ab Browse Files
07 Oct, 2023 1 commit

Merge branch 'feature-content4-2' into test_branch · 5b0ca954

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

authored Oct 07, 2023

5b0ca954 Browse Files

26 Sep, 2023 7 commits
- feature: 好办权限初始化 · d0d9a45f
  songyinghui authored Sep 26, 2023
  
  d0d9a45f Browse Files
- feature: 添加评论默认展示 · 5f3af5de
  songyinghui authored Sep 26, 2023
  
  5f3af5de Browse Files
- feature: 子评论参数 · dc30bb80
  songyinghui authored Sep 26, 2023
  
  dc30bb80 Browse Files
- feature: 评论列表 · 1c025291
  songyinghui authored Sep 26, 2023
  
  1c025291 Browse Files
- feature: 评论列表 · 0c99e85d
  songyinghui authored Sep 26, 2023
  
  0c99e85d Browse Files
- feature: 添加评论 · 702ac600
  songyinghui authored Sep 26, 2023
  
  702ac600 Browse Files
- feature: 好办评论 · 7321f5e1
  songyinghui authored Sep 26, 2023
  
  7321f5e1 Browse Files
25 Sep, 2023 7 commits
- 点赞入参形式 · 40ac1a1a
  王祖波 authored Sep 25, 2023
  
  40ac1a1a Browse Files
- 素材知识库数据 · 5692d3f6
  王祖波 authored Sep 25, 2023
  
  5692d3f6 Browse Files
- 素材知识库数据 · ee595103
  王祖波 authored Sep 25, 2023
  
  ee595103 Browse Files
- Merge remote-tracking branch 'origin/feature-content4-3' into feature-content4-3 · 235eaee8
  王祖波 authored Sep 25, 2023
  
  235eaee8 Browse Files
- 素材列表增加clerkId参数 · a120ff7c
  王祖波 authored Sep 25, 2023
  
  a120ff7c Browse Files
- Merge branch 'feature-content4-3' of git.gicdev.com:haoban3.0/haoban-manage3.0… · 8988211d
```
Merge branch 'feature-content4-3' of git.gicdev.com:haoban3.0/haoban-manage3.0 into feature-content4-3
```
  songyinghui authored Sep 25, 2023
  8988211d Browse Files
- feature: 接口文档 · 246a19a1
  songyinghui authored Sep 25, 2023
  
  246a19a1 Browse Files
22 Sep, 2023 1 commit
- 素材知识库 · 354a31bf
  王祖波 authored Sep 22, 2023
  
  354a31bf Browse Files
20 Sep, 2023 1 commit
- feature: 知识库-添加评论 · e9376a7b
  songyinghui authored Sep 20, 2023
  
  e9376a7b Browse Files
19 Sep, 2023 1 commit
- feature: 暂存 · ebb95b60
  songyinghui authored Sep 19, 2023
  
  ebb95b60 Browse Files
18 Sep, 2023 9 commits
- Merge branch 'bugfix/2023-08-31' into test_branch · a89f671f
  root authored Sep 18, 2023
  
  a89f671f Browse Files
- Merge branch 'bugfix/2023-08-31' into 'master' · 544fa2bc
```
加好友计数标识

See merge request !1452
```
  徐高华 authored Sep 18, 2023
  544fa2bc Browse Files
- 加好友计数标识 · bfd64b88
  徐高华 authored Sep 18, 2023
  
  bfd64b88 Browse Files
- Merge branch 'bugfix/2023-08-31' into 'master' · e3a20d9c
```
提供基础接口

See merge request !1451
```
  徐高华 authored Sep 18, 2023
  e3a20d9c Browse Files
- Merge remote-tracking branch 'origin/feature/九月迭代' · 0a4a9ad6
  jinxin authored Sep 18, 2023
  
  0a4a9ad6 Browse Files
- 如果过期时间小于当前时间，取当前时间 · 855550d0
  jinxin authored Sep 18, 2023
  
  855550d0 Browse Files
- Merge branch 'bugfix/2023-08-31' into test_branch · 8bd3fcee
  root authored Sep 18, 2023
  
  8bd3fcee Browse Files
- 提供基础接口 · 49455fb5
  徐高华 authored Sep 18, 2023
  
  49455fb5 Browse Files
- 内容数据转换修复 · 0ea93dab
  王祖波 authored Sep 18, 2023
  
  0ea93dab Browse Files
15 Sep, 2023 2 commits
- 增加操作人 · f10113be
  王祖波 authored Sep 15, 2023
  
  f10113be Browse Files
- AIGC生成文案 · 98896dd5
  王祖波 authored Sep 15, 2023
  
  98896dd5 Browse Files
14 Sep, 2023 6 commits
- Merge branch 'bugfix/2023-08-31' into 'master' · 6408b40e
```
Bugfix/2023 08 31

See merge request !1446
```
  徐高华 authored Sep 14, 2023
  6408b40e Browse Files
- Merge branch 'bugfix/2023-08-31' into test_branch · 0eee5cb0
  root authored Sep 14, 2023
  
  0eee5cb0 Browse Files
- 刷新好友 · dc980288
  徐高华 authored Sep 14, 2023
  
  dc980288 Browse Files
- 刷新好友 · 98537740
  徐高华 authored Sep 14, 2023
  
  98537740 Browse Files
- Merge branch 'bugfix/2023-08-31' into test_branch · aa4bd4ad
  root authored Sep 14, 2023
  
  aa4bd4ad Browse Files
- 刷新好友 · ee2e3935
  徐高华 authored Sep 14, 2023
  
  ee2e3935 Browse Files
13 Sep, 2023 3 commits
- Merge branch 'bugfix/2023-08-31' into 'master' · 4f0ee54e
```
标签同步

See merge request !1443
```
  徐高华 authored Sep 13, 2023
  4f0ee54e Browse Files
- Merge branch 'bugfix/2023-08-31' into test_branch · 74080850
  root authored Sep 13, 2023
  
  74080850 Browse Files
- 标签同步 · 90a59f13
  徐高华 authored Sep 13, 2023
  
  90a59f13 Browse Files