Commits · 90b25c0a7a611fe8cd01b67974344776fe0a6bd9 · haoban3.0 / haoban-manage3.0

04 May, 2023 6 commits
- 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
- 判断成员是否开启联系我 · 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 19 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
- 自建 · 7c037dde
  徐高华 authored Apr 24, 2023
  
  7c037dde Browse Files
- 自建 · 973b0041
  徐高华 authored Apr 24, 2023
  
  973b0041 Browse Files
23 Apr, 2023 10 commits
- Merge branch 'bugfix_multi_area' into 'master' · c9655b79
```
feat: 多商户对一个好办的周报发送情况

See merge request !1197
```
  songyinghui authored Apr 23, 2023
  c9655b79 Browse Files
- 第三方主体unionid转换为第三方external_userid 自建没有 · 0e4ffc0b
  徐高华 authored Apr 23, 2023
  
  0e4ffc0b Browse Files
- 自建 · 9362d993
  徐高华 authored Apr 23, 2023
  
  9362d993 Browse Files
- Merge branch 'feature-content2' into 'feature/自建应用验证' · bfb69aad
```
Feature content2

See merge request !1194
```
  徐高华 authored Apr 23, 2023
  bfb69aad Browse Files
- 小程序appid · eda27d91
  徐高华 authored Apr 23, 2023
  
  eda27d91 Browse Files
- 好办小程序id · 2d29d276
  徐高华 authored Apr 23, 2023
  
  2d29d276 Browse Files
- 自建 · 84d0ee09
  徐高华 authored Apr 23, 2023
  
  84d0ee09 Browse Files
- 好办自建 · a4263da8
  徐高华 authored Apr 23, 2023
  
  a4263da8 Browse Files
- feat: 区经品牌名称 · 784bab37
  songyinghui authored Apr 23, 2023
  
  784bab37 Browse Files
- feat: 区经选择问题 · e3b55642
  songyinghui authored Apr 23, 2023
  
  e3b55642 Browse Files