Commits · e802ef26e5e166a4fbd8b227a7e15fa96ff1a2fd · haoban3.0 / haoban-manage3.0 · GitLab

26 Sep, 2023 4 commits
- Merge branch 'feature-content4-3' into developer · e802ef26
  songyinghui authored Sep 26, 2023
  
  e802ef26 Browse Files
- feature: 添加评论 · 702ac600
  songyinghui authored Sep 26, 2023
  
  702ac600 Browse Files
- Merge branch 'feature-content4-3' into developer · a711ba5d
  songyinghui authored Sep 26, 2023
  
  a711ba5d Browse Files
- feature: 好办评论 · 7321f5e1
  songyinghui authored Sep 26, 2023
  
  7321f5e1 Browse Files
25 Sep, 2023 17 commits
- Merge branch 'feature-content4-3' into developer · 2550d395
  王祖波 authored Sep 25, 2023
  
  2550d395 Browse Files
- 点赞入参形式 · 40ac1a1a
  王祖波 authored Sep 25, 2023
  
  40ac1a1a Browse Files
- Merge branch 'feature-content4-3' into developer · 7d687ced
  王祖波 authored Sep 25, 2023
  
  7d687ced Browse Files
- 素材知识库数据 · 5692d3f6
  王祖波 authored Sep 25, 2023
  
  5692d3f6 Browse Files
- Merge branch 'feature-content4-3' into developer · 046caed9
  王祖波 authored Sep 25, 2023
  
  046caed9 Browse Files
- 素材知识库数据 · ee595103
  王祖波 authored Sep 25, 2023
  
  ee595103 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · e1e8c529
  王祖波 authored Sep 25, 2023
  
  e1e8c529 Browse Files
- Merge branch 'feature-content4-3' into developer · b230929c
  王祖波 authored Sep 25, 2023
  
  b230929c 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 'master-调整队列' into 'developer' · 41977f59
```
鸿星尔克

See merge request !1459
```
  徐高华 authored Sep 25, 2023
  41977f59 Browse Files
- 鸿星尔克 · 81db3fa3
  徐高华 authored Sep 25, 2023
  
  81db3fa3 Browse Files
- Merge branch 'bugfix_20230925' into developer · 02f6bf7f
  songyinghui authored Sep 25, 2023
  
  02f6bf7f Browse Files
- feature: 导购周报接口迁移 · 581dcd3a
  songyinghui authored Sep 25, 2023
  
  581dcd3a Browse Files
- Merge branch 'feature-content4-3' into developer · d46bebcd
  songyinghui authored Sep 25, 2023
  
  d46bebcd 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 7 commits
- Merge branch 'feature-content4-3' into developer · 1d2ec4a9
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java
```
  王祖波 authored Sep 22, 2023
  1d2ec4a9 Browse Files
- 素材知识库 · 354a31bf
  王祖波 authored Sep 22, 2023
  
  354a31bf Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 1a093bd7
  徐高华 authored Sep 22, 2023
  
  1a093bd7 Browse Files
- Merge branch 'master-调整队列' into 'master' · acb7c0dd
```
如果新门店未关联好办,进行解绑

See merge request !1458
```
  徐高华 authored Sep 22, 2023
  acb7c0dd Browse Files
- Merge branch 'master-调整队列' into 'developer' · 9be0bc76
```
如果新门店未关联好办,进行解绑

See merge request !1457
```
  徐高华 authored Sep 22, 2023
  9be0bc76 Browse Files
- 如果新门店未关联好办,进行解绑 · 5ac50c6a
  徐高华 authored Sep 22, 2023
  
  5ac50c6a Browse Files
- 如果新门店未关联好办,进行解绑 · 122aa93f
  徐高华 authored Sep 22, 2023
  
  122aa93f Browse Files
21 Sep, 2023 1 commit
- Merge branch 'master-调整队列' into 'master' · 1a744cac
```
Master 调整队列

See merge request !1456
```
  徐高华 authored Sep 21, 2023
  1a744cac Browse Files
20 Sep, 2023 7 commits
- Merge branch 'master-调整队列' into developer · c66a801a
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
```
  徐高华 authored Sep 20, 2023
  c66a801a Browse Files
- 如果新门店未关联好办,进行解绑 · bf44e19e
  徐高华 authored Sep 20, 2023
  
  bf44e19e Browse Files
- 同步好友 · ceeda59a
  徐高华 authored Sep 20, 2023
  
  ceeda59a Browse Files
- Merge branch 'master-调整队列' into developer · 715eff7c
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
```
  徐高华 authored Sep 20, 2023
  715eff7c Browse Files
- 同步通讯录 · 95bc90ff
  徐高华 authored Sep 20, 2023
  
  95bc90ff Browse Files
- 队列名调整 · 3cdbf9f8
  徐高华 authored Sep 20, 2023
  
  3cdbf9f8 Browse Files
- 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 3 commits
- Merge branch 'bugfix/2023-08-31' into 'developer' · c8f2a489
```
加好友计数标识

See merge request !1453
```
  徐高华 authored Sep 18, 2023
  c8f2a489 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