Commits · 1ff8ebe75caa6cc57ff3bcc34386daf7d2ca281c · haoban3.0 / haoban-manage3.0

13 Sep, 2022 14 commits
- Merge remote-tracking branch 'origin/master-xgh-好办停用' into developer · 1ff8ebe7
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
```
  徐高华 authored Sep 13, 2022
  1ff8ebe7 Browse Files
- 好友删导购 · b1e22ff2
  徐高华 authored Sep 13, 2022
  
  b1e22ff2 Browse Files
- log · 5939eb06
  徐高华 authored Sep 13, 2022
  
  5939eb06 Browse Files
- log · eba470d8
  徐高华 authored Sep 13, 2022
  
  eba470d8 Browse Files
- feat:合并代码 · 4c0f3a70
  墨竹 authored Sep 13, 2022
  
  4c0f3a70 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 7e853a28
  墨竹 authored Sep 13, 2022
  
  7e853a28 Browse Files
- Merge branch 'feat-0919' into developer · 14a6f9a5
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
```
  墨竹 authored Sep 13, 2022
  14a6f9a5 Browse Files
- Merge branch 'master-xgh-好办停用' into 'developer' · 5501838e
```
log

See merge request !236
```
  徐高华 authored Sep 13, 2022
  5501838e Browse Files
- log · f70b8a27
  徐高华 authored Sep 13, 2022
  
  f70b8a27 Browse Files
- feat:欧泊莱增加过滤 · 92f50acf
  墨竹 authored Sep 13, 2022
  
  92f50acf Browse Files
- Merge branch 'master-xgh-好办停用' into 'developer' · 3a718b83
```
外部联人id查询

See merge request !235
```
  徐高华 authored Sep 13, 2022
  3a718b83 Browse Files
- 外部联人id查询 · 6b6d73e3
  徐高华 authored Sep 13, 2022
  
  6b6d73e3 Browse Files
- Merge remote-tracking branch 'origin/master-xgh-好办停用' into developer · df1cbb79
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
```
  徐高华 authored Sep 13, 2022
  df1cbb79 Browse Files
- 外部联系人修复查询 · 0eaf2942
  徐高华 authored Sep 13, 2022
  
  0eaf2942 Browse Files
10 Sep, 2022 2 commits
- Merge branch 'master-xgh-好办停用' into 'developer' · 000a2013
```
加好友sql加wx企业id条件

See merge request !233
```
  徐高华 authored Sep 10, 2022
  000a2013 Browse Files
- 加好友sql加wx企业id条件 · 6660f2bb
  徐高华 authored Sep 10, 2022
  
  6660f2bb Browse Files
09 Sep, 2022 10 commits
- Merge branch 'master-xgh-好办停用' into 'developer' · 2542def3
```
好办停用

See merge request !232
```
  徐高华 authored Sep 09, 2022
  2542def3 Browse Files
- 好办停用 · 39f458ed
  徐高华 authored Sep 09, 2022
  
  39f458ed Browse Files
- Merge branch 'feat-0919' into developer · 5833d068
  墨竹 authored Sep 09, 2022
  
  5833d068 Browse Files
- feat:事件订阅test · 83dc1577
  墨竹 authored Sep 09, 2022
  
  83dc1577 Browse Files
- Merge branch 'feat-0919' into developer · cfcdac48
  墨竹 authored Sep 09, 2022
  
  cfcdac48 Browse Files
- feat:欧泊莱定制 · 0f1f4976
  墨竹 authored Sep 09, 2022
  
  0f1f4976 Browse Files
- feat:删除无效代码 · fa0df28a
  墨竹 authored Sep 09, 2022
  
  fa0df28a Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 1294a4a5
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
```
  墨竹 authored Sep 09, 2022
  1294a4a5 Browse Files
- Merge branch 'feat-0919' into developer · 65eb6e1e
  墨竹 authored Sep 09, 2022
  
  65eb6e1e Browse Files
- feat:欧泊莱定制需求 · 787d2c2e
  墨竹 authored Sep 09, 2022
  
  787d2c2e Browse Files
08 Sep, 2022 6 commits
- Merge branch 'master-xgh-好办停用' into 'developer' · 67075f14
```
corpid

See merge request !231
```
  徐高华 authored Sep 08, 2022
  67075f14 Browse Files
- corpid · be6a36bb
  徐高华 authored Sep 08, 2022
  
  be6a36bb Browse Files
- feat:欧泊莱定制需求 · a0847830
  墨竹 authored Sep 08, 2022
  
  a0847830 Browse Files
- feat:欧泊莱定制需求 · c64318b1
  墨竹 authored Sep 08, 2022
  
  c64318b1 Browse Files
- Merge branch 'master-xgh-好办停用' into 'developer' · d0bc77c5
```
Master xgh 好办停用

See merge request !230
```
  徐高华 authored Sep 08, 2022
  d0bc77c5 Browse Files
- 批量新增代办 · 6d5b7de5
  徐高华 authored Sep 08, 2022
  
  6d5b7de5 Browse Files
07 Sep, 2022 1 commit
- 删除无效代码 · eba9f8ac
  徐高华 authored Sep 07, 2022
  
  eba9f8ac Browse Files
06 Sep, 2022 1 commit
- Merge branch 'master_xgh_会员待开发+商户停用' into 'master' · dce837f7
```
Master xgh 会员待开发+商户停用

See merge request !229
```
  徐高华 authored Sep 06, 2022
  dce837f7 Browse Files
05 Sep, 2022 5 commits
- Merge remote-tracking branch 'origin/master-xgh-好办停用' into developer · 936ad273
```
Conflicts:
	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
```
  徐高华 authored Sep 05, 2022
  936ad273 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_会员待开发+商户停用' into · 2cdeac4d
```
master-xgh-好办停用

Conflicts:
	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
```
  徐高华 authored Sep 05, 2022
  2cdeac4d Browse Files
- log · ae231b39
  徐高华 authored Sep 05, 2022
  
  ae231b39 Browse Files
- Merge branch 'master-xgh-好办停用' into 'developer' · b1657401
```
好办停用

See merge request !226
```
  徐高华 authored Sep 05, 2022
  b1657401 Browse Files
- 好办停用 · ffeddfa8
  徐高华 authored Sep 05, 2022
  
  ffeddfa8 Browse Files
03 Sep, 2022 1 commit
- Merge branch 'master-xgh-好办停用' into 'developer' · b209b199
```
商户停用

See merge request !225
```
  徐高华 authored Sep 03, 2022
  b209b199 Browse Files