Commits · e4b9d013c6be9e7023518c7da2dfc5ebbc184b91 · haoban3.0 / haoban-manage3.0

04 Jan, 2023 2 commits

Merge remote-tracking branch 'origin/feature/社群' into developer · e4b9d013

Conflicts:
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/QywxErrorLogDTO.java
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/QywxErrorLogListQDTO.java
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QywxErrorLogApiService.java
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabQywxErrorLog.java
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/TabQywxErrorLogBO.java
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/QywxErrorLogService.java
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/TabQywxErrorLogServiceImpl.java
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QywxErrorLogApiServiceImpl.java

authored Jan 04, 2023

e4b9d013 Browse Files

欢迎语日志 · 19040ddd
徐高华 authored Jan 04, 2023

19040ddd Browse Files

03 Jan, 2023 18 commits
- Merge branch 'feature/社群' into 'developer' · 3d7c9bc5
```
Feature/社群

See merge request !815
```
  徐高华 authored Jan 03, 2023
  3d7c9bc5 Browse Files
- 群发详情 · 59c4f1a8
  徐高华 authored Jan 03, 2023
  
  59c4f1a8 Browse Files
- 删除群活码下自动剔除的群查询逻辑 · b811e21a
  徐高华 authored Jan 03, 2023
  
  b811e21a Browse Files
- Merge branch 'feature/社群' into 'developer' · 9e103e3c
```
Feature/社群

See merge request !814
```
  徐高华 authored Jan 03, 2023
  9e103e3c Browse Files
- 剔除 · b1a2bf81
  徐高华 authored Jan 03, 2023
  
  b1a2bf81 Browse Files
- 待开发id更新 · be646906
  徐高华 authored Jan 03, 2023
  
  be646906 Browse Files
- Merge branch 'feature/社群' into 'developer' · a79cf6e7
```
小程序查询

See merge request !813
```
  徐高华 authored Jan 03, 2023
  a79cf6e7 Browse Files
- 小程序查询 · 1f1143ee
  徐高华 authored Jan 03, 2023
  
  1f1143ee Browse Files
- Merge branch 'feature/社群' into 'developer' · 4e4dd505
```
通过导购查询

See merge request !812
```
  徐高华 authored Jan 03, 2023
  4e4dd505 Browse Files
- 通过导购查询 · 296c28b9
  徐高华 authored Jan 03, 2023
  
  296c28b9 Browse Files
- Merge branch 'feature/社群' into 'developer' · e14ff23d
```
店长

See merge request !811
```
  徐高华 authored Jan 03, 2023
  e14ff23d Browse Files
- 店长 · d8739809
  徐高华 authored Jan 03, 2023
  
  d8739809 Browse Files
- Merge branch 'feature/社群' into 'developer' · e74eb179
```
计划名称

See merge request !810
```
  徐高华 authored Jan 03, 2023
  e74eb179 Browse Files
- 计划名称 · 06974277
  徐高华 authored Jan 03, 2023
  
  06974277 Browse Files
- Merge remote-tracking branch 'origin/feature/社群' into developer · 793fb0c0
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabQywxErrorLogMapper.java
	haoban-manage3-service/src/main/resources/mapper/TabQywxErrorLogMapper.xml
```
  徐高华 authored Jan 03, 2023
  793fb0c0 Browse Files
- 刷新群发 · 65628474
  徐高华 authored Jan 03, 2023
  
  65628474 Browse Files
- Merge branch 'feature/社群' into 'developer' · 679379ee
```
排序

See merge request !807
```
  徐高华 authored Jan 03, 2023
  679379ee Browse Files
- 排序 · 35ac6488
  徐高华 authored Jan 03, 2023
  
  35ac6488 Browse Files
30 Dec, 2022 7 commits
- Merge branch 'feature/社群' into 'developer' · 68f64b05
```
/

See merge request !805
```
  徐高华 authored Dec 30, 2022
  68f64b05 Browse Files
- / · dc45157f
  徐高华 authored Dec 30, 2022
  
  dc45157f Browse Files
- Merge branch 'feature/社群' into 'developer' · f78b11fa
```
小程序查询接口

See merge request !804
```
  徐高华 authored Dec 30, 2022
  f78b11fa Browse Files
- 小程序查询接口 · 35186da2
  徐高华 authored Dec 30, 2022
  
  35186da2 Browse Files
- Merge branch 'feature/社群' into 'developer' · 086d0a2c
```
Feature/社群

See merge request !803
```
  徐高华 authored Dec 30, 2022
  086d0a2c Browse Files
- add一对一设置企业ID · f230bde7
  徐高华 authored Dec 30, 2022
  
  f230bde7 Browse Files
- log · 670e61bd
  徐高华 authored Dec 30, 2022
  
  670e61bd Browse Files
29 Dec, 2022 13 commits
- Merge branch 'feature/社群' into 'developer' · 12b41ea5
```
sql

See merge request !801
```
  徐高华 authored Dec 29, 2022
  12b41ea5 Browse Files
- sql · 079baf52
  徐高华 authored Dec 29, 2022
  
  079baf52 Browse Files
- Merge branch 'feature/社群' into 'developer' · 0bc35b56
```
群主变更

See merge request !800
```
  徐高华 authored Dec 29, 2022
  0bc35b56 Browse Files
- 群主变更 · ae2dbe8f
  徐高华 authored Dec 29, 2022
  
  ae2dbe8f Browse Files
- Merge branch 'feature/社群' into 'developer' · 20952431
```
更新标识

See merge request !799
```
  徐高华 authored Dec 29, 2022
  20952431 Browse Files
- 更新标识 · 6ad8a4f5
  徐高华 authored Dec 29, 2022
  
  6ad8a4f5 Browse Files
- Merge branch 'feature/社群' into 'developer' · 957d6897
```
任务

See merge request !798
```
  徐高华 authored Dec 29, 2022
  957d6897 Browse Files
- 任务 · b181d9d4
  徐高华 authored Dec 29, 2022
  
  b181d9d4 Browse Files
- Merge branch 'feature/社群' into 'developer' · 91a77f70
```
Feature/社群

See merge request !797
```
  徐高华 authored Dec 29, 2022
  91a77f70 Browse Files
- 商户判断 · b27677d0
  徐高华 authored Dec 29, 2022
  
  b27677d0 Browse Files
- Merge branch 'feature/社群' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into feature/社群 · 3db536d8
  徐高华 authored Dec 29, 2022
  
  3db536d8 Browse Files
- 主门店和任务企业不一致 · c8d23b17
  徐高华 authored Dec 29, 2022
  
  c8d23b17 Browse Files
- Merge branch 'feature/社群' into 'developer' · 2502b3e9
```
排序

See merge request !796
```
  徐高华 authored Dec 29, 2022
  2502b3e9 Browse Files