Commits · 6f2c28dd1c5819d91ed936390c18c104934e2ce1 · haoban3.0 / haoban-manage3.0 · GitLab

15 Sep, 2022 4 commits
- fix:空指针修改 · 6f2c28dd
  墨竹 authored Sep 15, 2022
  
  6f2c28dd Browse Files
- fix:解绑入口统一，并将好友关系解除通知会员 · 25157c99
  墨竹 authored Sep 15, 2022
  
  25157c99 Browse Files
- fix:解绑入口统一，并将好友关系解除通知会员 · 634e9590
  墨竹 authored Sep 15, 2022
  
  634e9590 Browse Files
- fix:会员删除导购bug修改 · ac3c4ab5
  墨竹 authored Sep 15, 2022
  
  ac3c4ab5 Browse Files
14 Sep, 2022 6 commits
- Merge branch 'fixbug_0914' into 'developer' · 20972d03
```
导出无部门bug

See merge request !234
```
  徐高华 authored Sep 14, 2022
  20972d03 Browse Files
- 导出无部门bug · a8e4e24d
  徐高华 authored Sep 14, 2022
  
  a8e4e24d Browse Files
- Merge branch 'fixbug_0914' into developer · 4cd3eff7
  墨竹 authored Sep 14, 2022
  
  4cd3eff7 Browse Files
- fix:优化好友列表sql · fdb09d6a
  墨竹 authored Sep 14, 2022
  
  fdb09d6a Browse Files
- Merge branch 'fixbug_0914' into developer · 60ee350f
  墨竹 authored Sep 14, 2022
  
  60ee350f Browse Files
- fix:优化好友列表sql、导购code不校验 · 1a85025c
  墨竹 authored Sep 14, 2022
  
  1a85025c Browse Files
13 Sep, 2022 21 commits
- feat:欧泊莱定制 · 1b4bf848
  墨竹 authored Sep 13, 2022
  
  1b4bf848 Browse Files
- Merge remote-tracking branch 'origin/master-xgh-好办停用' into developer · c707356e
  徐高华 authored Sep 13, 2022
  
  c707356e Browse Files
- 代码回退 · ea31d26f
  徐高华 authored Sep 13, 2022
  
  ea31d26f Browse Files
- Merge branch 'master-xgh-好办停用' into 'developer' · 8fe3b6ba
```
log

See merge request !238
```
  徐高华 authored Sep 13, 2022
  8fe3b6ba Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · fab694a8
  墨竹 authored Sep 13, 2022
  
  fab694a8 Browse Files
- feat:恢复代码 · 6d228b2a
  墨竹 authored Sep 13, 2022
  
  6d228b2a Browse Files
- log · 931fef35
  徐高华 authored Sep 13, 2022
  
  931fef35 Browse Files
- 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 7 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