Commits · 315abbd357cbedc4c5830f18f48f75ffe8ee9a96 · haoban3.0 / haoban-manage3.0

08 May, 2023 5 commits
- Merge branch 'feature/自建应用验证' into 'master' · 315abbd3
```
Feature/自建应用验证

See merge request !1227
```
  徐高华 authored May 08, 2023
  315abbd3 Browse Files
- 自建应用不更新统计 · 38e045c7
  徐高华 authored May 08, 2023
  
  38e045c7 Browse Files
- 自建群id · b9120e7e
  徐高华 authored May 08, 2023
  
  b9120e7e Browse Files
- Merge branch 'ferture/四月迭代需求' into 'master' · 16bc5aa8
```
省市区调整

See merge request !1221
```
  徐高华 authored May 08, 2023
  16bc5aa8 Browse Files
- 自建回调过滤 · ee0af121
  徐高华 authored May 08, 2023
  
  ee0af121 Browse Files
04 May, 2023 13 commits
- sql · d9df1c8b
  徐高华 authored May 05, 2023
  
  d9df1c8b Browse Files
- test · 39943557
  徐高华 authored May 05, 2023
  
  39943557 Browse Files
- Merge branch 'feature/自建应用验证' into 'master' · 78ddb7e7
```
Feature/自建应用验证

See merge request !1217
```
  徐高华 authored May 04, 2023
  78ddb7e7 Browse Files
- 自建 · 555aef3f
  徐高华 authored May 04, 2023
  
  555aef3f Browse Files
- 非空判断 · 4f29e193
  徐高华 authored May 04, 2023
  
  4f29e193 Browse Files
- 删除无效代码 · 2ed6c4f9
  徐高华 authored May 04, 2023
  
  2ed6c4f9 Browse Files
- Merge remote-tracking branch 'origin/feature/自建应用验证' · 90b25c0a
```
Conflicts:
	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
	haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
```
  徐高华 authored May 04, 2023
  90b25c0a Browse Files
- sql处理 · baf2a439
  jinxin authored May 04, 2023
  
  baf2a439 Browse Files
- 基本类型问题处理 · a567e254
  jinxin authored May 04, 2023
  
  a567e254 Browse Files
- 日志记录 · 715e1d7d
  jinxin authored May 04, 2023
  
  715e1d7d Browse Files
- 省市区调整 · f5331cee
  徐高华 authored May 04, 2023
  
  f5331cee Browse Files
- 判断成员是否开启联系我 · 5b1bc462
  jinxin authored May 04, 2023
  
  5b1bc462 Browse Files
- 判断成员是否开启联系我 · 3fe97247
  jinxin authored May 04, 2023
  
  3fe97247 Browse Files
27 Apr, 2023 3 commits
- Merge branch 'bugfix/2023-04-27' into 'master' · 7d81462e
```
通讯录日志过滤

See merge request !1213
```
  jinxin authored Apr 27, 2023
  7d81462e Browse Files
- 通讯录日志过滤 · c4eac663
  jinxin authored Apr 27, 2023
  
  c4eac663 Browse Files
- Merge branch 'feature/许可账号购买二期' into 'master' · 5a9409be
```
Feature/许可账号购买二期

See merge request !1212
```
  王祖波 authored Apr 27, 2023
  5a9409be Browse Files
26 Apr, 2023 2 commits
- Merge branch 'ferture/四月迭代需求' into 'master' · 3e42e9c0
```
群满-待开发的id可能查不到

See merge request !1209
```
  徐高华 authored Apr 26, 2023
  3e42e9c0 Browse Files
- 群满-待开发的id可能查不到 · 11214cab
  徐高华 authored Apr 26, 2023
  
  11214cab Browse Files
24 Apr, 2023 17 commits
- Merge branch 'ferture/四月迭代需求' into 'master' · 9301f3e1
```
设置主门店

See merge request !1208
```
  徐高华 authored Apr 25, 2023
  9301f3e1 Browse Files
- 设置主门店 · 2d276437
  徐高华 authored Apr 25, 2023
  
  2d276437 Browse Files
- Merge branch 'ferture/四月迭代需求' into 'master' · 54251f50
```
test

See merge request !1207
```
  徐高华 authored Apr 25, 2023
  54251f50 Browse Files
- test · 2688fbc0
  徐高华 authored Apr 25, 2023
  
  2688fbc0 Browse Files
- Merge branch 'ferture/四月迭代需求' into 'master' · 49b6849e
```
换门店后,查询主门店

See merge request !1206
```
  徐高华 authored Apr 25, 2023
  49b6849e Browse Files
- 换门店后,查询主门店 · bf4fb7e2
  徐高华 authored Apr 25, 2023
  
  bf4fb7e2 Browse Files
- Merge branch 'bugfix_0424' into 'master' · 9ac16bb8
```
Bugfix 0424

See merge request !1205
```
  songyinghui authored Apr 24, 2023
  9ac16bb8 Browse Files
- Merge remote-tracking branch 'origin/master' into bugfix_0424 · 7f6227f1
  songyinghui authored Apr 24, 2023
  
  7f6227f1 Browse Files
- Merge branch 'bugfix/2023-04-21' into 'master' · 720c1b9f
```
Bugfix/2023 04 21

See merge request !1204
```
  jinxin authored Apr 24, 2023
  720c1b9f Browse Files
- 如果是小程序解绑，需要存储staffName · cc21817e
  jinxin authored Apr 24, 2023
  
  cc21817e Browse Files
- feat: 周报月报后门 · 11b0d752
  songyinghui authored Apr 24, 2023
  
  11b0d752 Browse Files
- Merge remote-tracking branch 'origin/ferture/四月迭代需求' · 7b79f3a2
```
Conflicts:
	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
	haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
```
  徐高华 authored Apr 24, 2023
  7b79f3a2 Browse Files
- / · d56cd354
  徐高华 authored Apr 24, 2023
  
  d56cd354 Browse Files
- Merge branch 'ferture/四月迭代需求' into 'feature/自建应用验证' · 94dc3ebc
```
Ferture/四月迭代需求

See merge request !1201
```
  徐高华 authored Apr 24, 2023
  94dc3ebc Browse Files
- / · ba6f0683
  徐高华 authored Apr 24, 2023
  
  ba6f0683 Browse Files
- 删除无效 · 3463d15c
  徐高华 authored Apr 24, 2023
  
  3463d15c Browse Files
- 过滤回收站的门店 · 8dd59e75
  徐高华 authored Apr 24, 2023
  
  8dd59e75 Browse Files