Commits · 9be0bc76980c12cb7c06b625dd9c0d9d29748d3f · haoban3.0 / haoban-manage3.0 · GitLab

22 Sep, 2023 2 commits
- 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
20 Sep, 2023 6 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
18 Sep, 2023 12 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
- 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
- Merge remote-tracking branch 'origin/developer' into developer · c8900151
  jinxin authored Sep 18, 2023
  
  c8900151 Browse Files
- Merge remote-tracking branch 'origin/feature/九月迭代' into developer · 9a6e74c1
  jinxin authored Sep 18, 2023
  
  9a6e74c1 Browse Files
- 如果过期时间小于当前时间，取当前时间 · 855550d0
  jinxin authored Sep 18, 2023
  
  855550d0 Browse Files
- Merge branch 'bugfix/2023-08-31' into 'developer' · d7e95d1b
```
提供基础接口

See merge request !1450
```
  徐高华 authored Sep 18, 2023
  d7e95d1b Browse Files
- 提供基础接口 · 49455fb5
  徐高华 authored Sep 18, 2023
  
  49455fb5 Browse Files
- Merge branch 'bugfix-20230918' into 'developer' · 3183cdde
```
内容数据转换修复

See merge request !1449
```
  王祖波 authored Sep 18, 2023
  3183cdde Browse Files
- 内容数据转换修复 · 0ea93dab
  王祖波 authored Sep 18, 2023
  
  0ea93dab Browse Files
15 Sep, 2023 4 commits
- Merge branch 'feature-content4-2' into 'developer' · 81f3f32d
```
增加操作人

See merge request !1448
```
  王祖波 authored Sep 15, 2023
  81f3f32d Browse Files
- 增加操作人 · f10113be
  王祖波 authored Sep 15, 2023
  
  f10113be Browse Files
- Merge branch 'feature-content4-2' into 'developer' · c8033a8b
```
Feature content4 2

See merge request !1447
```
  王祖波 authored Sep 15, 2023
  c8033a8b 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 'developer' · d07e1bd1
```
Bugfix/2023 08 31

See merge request !1445
```
  徐高华 authored Sep 14, 2023
  d07e1bd1 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 'developer' · 8a8b6df7
```
刷新好友

See merge request !1444
```
  徐高华 authored Sep 14, 2023
  8a8b6df7 Browse Files
- 刷新好友 · ee2e3935
  徐高华 authored Sep 14, 2023
  
  ee2e3935 Browse Files
13 Sep, 2023 10 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 'developer' · a0c11e89
```
标签同步

See merge request !1442
```
  徐高华 authored Sep 13, 2023
  a0c11e89 Browse Files
- 标签同步 · 90a59f13
  徐高华 authored Sep 13, 2023
  
  90a59f13 Browse Files
- Merge branch 'bugfix/2023-08-31' into 'master' · e0fadeb5
```
标签同步

See merge request !1441
```
  徐高华 authored Sep 13, 2023
  e0fadeb5 Browse Files
- Merge branch 'bugfix/2023-08-31' into 'developer' · cdd2701b
```
标签同步

See merge request !1440
```
  徐高华 authored Sep 13, 2023
  cdd2701b Browse Files
- 标签同步 · 2423479e
  徐高华 authored Sep 13, 2023
  
  2423479e Browse Files
- Merge branch 'bugfix/2023-08-31' into 'master' · 2fe1e587
```
文件后缀

See merge request !1439
```
  徐高华 authored Sep 13, 2023
  2fe1e587 Browse Files
- 文件后缀 · b67c6ccf
  徐高华 authored Sep 13, 2023
  
  b67c6ccf Browse Files
- Merge remote-tracking branch 'origin/feature/九月迭代' · 02063651
  jinxin authored Sep 13, 2023
  
  02063651 Browse Files
- Merge branch 'bugfix/2023-08-31' into developer · 980839b7
```
# Conflicts:
#	haoban-manage3-service/pom.xml
```
  徐高华 authored Sep 13, 2023
  980839b7 Browse Files