Commits · 001af8a3526ab0e7d3d5350451715416f62ae624 · haoban3.0 / haoban-manage3.0 · GitLab

19 Sep, 2022 20 commits
- fix：增加日志 · 001af8a3
  墨竹 authored Sep 20, 2022
  
  001af8a3 Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · a547c56a
```
修复查询外部联系人

See merge request !251
```
  徐高华 authored Sep 20, 2022
  a547c56a Browse Files
- 修复查询外部联系人 · e503c0a4
  徐高华 authored Sep 20, 2022
  
  e503c0a4 Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · a637b07a
```
log

See merge request !248
```
  徐高华 authored Sep 19, 2022
  a637b07a Browse Files
- log · b94f31dc
  徐高华 authored Sep 19, 2022
  
  b94f31dc Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · 86eecbf5
```
第三方和代开id

See merge request !246
```
  徐高华 authored Sep 19, 2022
  86eecbf5 Browse Files
- 第三方和代开id · c7ee0b00
  徐高华 authored Sep 19, 2022
  
  c7ee0b00 Browse Files
- Merge remote-tracking branch 'origin/master' · 5e47cead
  墨竹 authored Sep 19, 2022
  
  5e47cead Browse Files
- Merge branch 'feat-0919' · ae46a9e6
  墨竹 authored Sep 19, 2022
  
  ae46a9e6 Browse Files
- fix:修复企业id未传问题 · e1557649
  墨竹 authored Sep 19, 2022
  
  e1557649 Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · 8a6caa26
```
好办停用

See merge request !243
```
  徐高华 authored Sep 19, 2022
  8a6caa26 Browse Files
- 好办停用 · 285111ff
  徐高华 authored Sep 19, 2022
  
  285111ff Browse Files
- Merge branch 'master' into 'master-xgh-好办停用' · 3993f6df
```
# Conflicts:
#   haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
```
  徐高华 authored Sep 19, 2022
  3993f6df Browse Files
- test · 01765116
  徐高华 authored Sep 19, 2022
  
  01765116 Browse Files
- test · 6ea50fdc
  徐高华 authored Sep 19, 2022
  
  6ea50fdc Browse Files
- test · aab84d9e
  徐高华 authored Sep 19, 2022
  
  aab84d9e Browse Files
- test · b4df80b6
  徐高华 authored Sep 19, 2022
  
  b4df80b6 Browse Files
- 好办过期 · ff94c938
  徐高华 authored Sep 19, 2022
  
  ff94c938 Browse Files
- Merge branch 'master-xgh-好办停用' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · cf09d549
```
# Conflicts:
#	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
#	haoban-manage3-service/src/test/java/HmPageServiceTest.java
```
  墨竹 authored Sep 19, 2022
  cf09d549 Browse Files
- Merge branch 'feat-0919' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · a8267cb7
  墨竹 authored Sep 19, 2022
  
  a8267cb7 Browse Files
16 Sep, 2022 3 commits
- Merge branch 'master_xgh_0916_bug' into 'master' · 02d9a2eb
```
tokenbug修改

See merge request !237
```
  徐高华 authored Sep 16, 2022
  02d9a2eb Browse Files
- tokenbug修改 · 92053ffe
  徐高华 authored Sep 16, 2022
  
  92053ffe Browse Files
- fix:空指针 · 86b70229
  墨竹 authored Sep 16, 2022
  
  86b70229 Browse Files
15 Sep, 2022 5 commits
- fix:删除门店好友关系解除 · ddabacbf
  墨竹 authored Sep 15, 2022
  
  ddabacbf Browse Files
- 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 9 commits
- Merge branch 'fixbug_0914' into 'master' · b766b9ab
```
导出无部门bug

See merge request !235
```
  徐高华 authored Sep 14, 2022
  b766b9ab Browse Files
- 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
- paddingid · 07517804
  徐高华 authored Sep 14, 2022
  
  07517804 Browse Files
- test · 85dde237
  徐高华 authored Sep 14, 2022
  
  85dde237 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 3 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