Commits · cf9ae6b7c8414a11c337b49e4d4953f7d13b667a · haoban3.0 / haoban-manage3.0 · GitLab

29 Sep, 2022 10 commits
- Merge branch 'master_xgh_pendingid' into 'developer' · cf9ae6b7
```
Master xgh pendingid

See merge request !283
```
  徐高华 authored Sep 29, 2022
  cf9ae6b7 Browse Files
- test · 1ec97747
  徐高华 authored Sep 29, 2022
  
  1ec97747 Browse Files
- Merge branch 'master_xgh_博格瑞绝色bug' into 'master_xgh_pendingid' · e941e673
```
Master xgh 博格瑞绝色bug

See merge request !282
```
  徐高华 authored Sep 29, 2022
  e941e673 Browse Files
- pendingid · b5558721
  徐高华 authored Sep 29, 2022
  
  b5558721 Browse Files
- Merge branch 'feature-haoban-role' into developer · 6b320e7d
  墨竹 authored Sep 29, 2022
  
  6b320e7d Browse Files
- fix:查询数量bug · 3a7301b4
  墨竹 authored Sep 29, 2022
  
  3a7301b4 Browse Files
- Merge branch 'feature-haoban-role' into developer · dbbdcb34
  墨竹 authored Sep 29, 2022
  
  dbbdcb34 Browse Files
- feat:返回商户logo · e232cd42
  墨竹 authored Sep 29, 2022
  
  e232cd42 Browse Files
- Merge branch 'feature-haoban-role' into developer · d0fdec68
  墨竹 authored Sep 29, 2022
  
  d0fdec68 Browse Files
- feat:去除绑定 · 2ac9ff02
  墨竹 authored Sep 29, 2022
  
  2ac9ff02 Browse Files
28 Sep, 2022 16 commits
- Merge branch 'master_xgh_博格瑞绝色bug' into 'developer' · c6f14adf
```
log

See merge request !279
```
  徐高华 authored Sep 28, 2022
  c6f14adf Browse Files
- log · 1d265357
  徐高华 authored Sep 28, 2022
  
  1d265357 Browse Files
- Merge branch 'master_xgh_博格瑞绝色bug' into 'developer' · ff30e906
```
绝色企业在2个服务商，通讯录特殊处理

See merge request !276
```
  徐高华 authored Sep 28, 2022
  ff30e906 Browse Files
- 绝色企业在2个服务商，通讯录特殊处理 · 30670e02
  徐高华 authored Sep 28, 2022
  
  30670e02 Browse Files
- test · b603ed9f
  徐高华 authored Sep 28, 2022
  
  b603ed9f Browse Files
- test · 57e36b3b
  徐高华 authored Sep 28, 2022
  
  57e36b3b Browse Files
- Merge branch 'feature-haoban-role' into developer · 17290a07
  墨竹 authored Sep 28, 2022
  
  17290a07 Browse Files
- feat:权限初始化调整 · 1ae2695f
  墨竹 authored Sep 28, 2022
  
  1ae2695f Browse Files
- feat:接口优化 · d73d9b93
  墨竹 authored Sep 28, 2022
  
  d73d9b93 Browse Files
- feat:加好友 · a4650ccb
  墨竹 authored Sep 27, 2022
  
  a4650ccb Browse Files
- feat:收费增加待转移字段 · d37d72fb
  墨竹 authored Sep 27, 2022
  
  d37d72fb Browse Files
- feat:权限 · c83d0ea2
  墨竹 authored Sep 27, 2022
  
  c83d0ea2 Browse Files
- feat:代码优化 · ff054bc6
  墨竹 authored Sep 27, 2022
  
  ff054bc6 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_pendingid' into · 7f422dd1
```
developer

Conflicts:
	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
```
  徐高华 authored Sep 28, 2022
  7f422dd1 Browse Files
- 企微pendingid · 8a69d1a2
  徐高华 authored Sep 28, 2022
  
  8a69d1a2 Browse Files
- feat:接口优化 · 1b6b188f
  墨竹 authored Sep 28, 2022
  
  1b6b188f Browse Files
27 Sep, 2022 8 commits
- feat:加好友 · 8c417608
  墨竹 authored Sep 27, 2022
  
  8c417608 Browse Files
- feat:收费增加待转移字段 · 80673e97
  墨竹 authored Sep 27, 2022
  
  80673e97 Browse Files
- feat:权限 · 76f653e5
  墨竹 authored Sep 27, 2022
  
  76f653e5 Browse Files
- feat:代码优化 · c32ea00d
  墨竹 authored Sep 27, 2022
  
  c32ea00d Browse Files
- feat:报错调整 · 06826390
  墨竹 authored Sep 27, 2022
  
  06826390 Browse Files
- feat:游客权限 · c42095e1
  墨竹 authored Sep 27, 2022
  
  c42095e1 Browse Files
- feat:游客权限 · 40cd5725
  墨竹 authored Sep 27, 2022
  
  40cd5725 Browse Files
- feat:关联导购数量 · 0510ffe4
  墨竹 authored Sep 27, 2022
  
  0510ffe4 Browse Files
26 Sep, 2022 6 commits
- fix：埋点增加判断 · 35b05022
  墨竹 authored Sep 26, 2022
  
  35b05022 Browse Files
- feat:绑定的好友数量 · ce4ec087
  墨竹 authored Sep 26, 2022
  
  ce4ec087 Browse Files
- Merge branch 'master-xgh-好办停用' into 'master' · 33b6873c
```
好友查询

See merge request !274
```
  徐高华 authored Sep 26, 2022
  33b6873c Browse Files
- feat:绑定的好友数量 · 021ac79d
  墨竹 authored Sep 26, 2022
  
  021ac79d Browse Files
- feat:绑定的商户列表和门店列表 · 9ef1580f
  墨竹 authored Sep 26, 2022
  
  9ef1580f Browse Files
- feat:绑定的商户列表和门店列表 · 5289be9a
  墨竹 authored Sep 26, 2022
  
  5289be9a Browse Files