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

08 Oct, 2022 37 commits
- Merge branch 'master_xgh_pendingid' into 'developer' · a3298017
```
log

See merge request !295
```
  徐高华 authored Oct 08, 2022
  a3298017 Browse Files
- log · 28a027ec
  徐高华 authored Oct 08, 2022
  
  28a027ec Browse Files
- Merge branch 'master_xgh_pendingid' into 'developer' · 5b259fea
```
Master xgh pendingid

See merge request !294
```
  徐高华 authored Oct 08, 2022
  5b259fea Browse Files
- 创建会员的判断 · 992847f4
  徐高华 authored Oct 08, 2022
  
  992847f4 Browse Files
- Merge branch 'master' into developer · f27d3e2c
  墨竹 authored Oct 08, 2022
  
  f27d3e2c Browse Files
- fix:成员删除，好友关系解除，判断该会员是否有其他导购好友 · d6d8de54
  墨竹 authored Oct 08, 2022
  
  d6d8de54 Browse Files
- Merge branch 'master' into developer · 7b5b09d9
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
#	haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
```
  墨竹 authored Oct 08, 2022
  7b5b09d9 Browse Files
- fix:成员删除，好友关系解除，判断该会员是否有其他导购好友 · e62b15bc
  墨竹 authored Oct 08, 2022
  
  e62b15bc Browse Files
- log · 4ac7fd0b
  徐高华 authored Oct 08, 2022
  
  4ac7fd0b Browse Files
- Merge branch 'feature-haoban-role' into developer · 5fc666c3
  墨竹 authored Oct 08, 2022
  
  5fc666c3 Browse Files
- fix:查询区经列表修改 · 2c9f40c7
  墨竹 authored Oct 08, 2022
  
  2c9f40c7 Browse Files
- fix:欧泊莱定制修改 · 549a1f70
  墨竹 authored Oct 08, 2022
  
  549a1f70 Browse Files
- Merge branch 'feature-haoban-role' into developer · f99c8221
  墨竹 authored Oct 08, 2022
  
  f99c8221 Browse Files
- fix:游客模式修改 · a22bdb27
  墨竹 authored Oct 08, 2022
  
  a22bdb27 Browse Files
- Merge branch 'feature-haoban-role' into developer · d47af2f7
  墨竹 authored Oct 08, 2022
  
  d47af2f7 Browse Files
- fix:游客模式修改 · 294ef80a
  墨竹 authored Oct 08, 2022
  
  294ef80a Browse Files
- Merge branch 'feature-haoban-role' into developer · 80a276aa
  墨竹 authored Oct 08, 2022
  
  80a276aa Browse Files
- fix:查询菜单接口修改 · a27de19c
  墨竹 authored Oct 08, 2022
  
  a27de19c Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · e6605147
  墨竹 authored Oct 08, 2022
  
  e6605147 Browse Files
- Merge branch 'feature-haoban-role' into developer · 36fc2579
  墨竹 authored Oct 08, 2022
  
  36fc2579 Browse Files
- feat:新增查询区经列表接口 · 5bd9f51c
  墨竹 authored Oct 08, 2022
  
  5bd9f51c Browse Files
- log · 400d300f
  徐高华 authored Oct 08, 2022
  
  400d300f Browse Files
- Merge branch 'master_xgh_pendingid' into 'developer' · eff25174
```
test

See merge request !293
```
  徐高华 authored Oct 08, 2022
  eff25174 Browse Files
- test · 85fac05b
  徐高华 authored Oct 08, 2022
  
  85fac05b Browse Files
- Merge branch 'master_xgh_pendingid' into 'developer' · ba8cda34
```
定时修复部门

See merge request !292
```
  徐高华 authored Oct 08, 2022
  ba8cda34 Browse Files
- 定时修复部门 · 5a503356
  徐高华 authored Oct 08, 2022
  
  5a503356 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_pendingid' into · ee13d8d2
```
developer

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
```
  徐高华 authored Oct 08, 2022
  ee13d8d2 Browse Files
- 修复部门 · 35e25ce4
  徐高华 authored Oct 08, 2022
  
  35e25ce4 Browse Files
- Merge remote-tracking branch 'origin/master_xgh_pendingid' into · cda95f4e
```
developer

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
```
  徐高华 authored Oct 08, 2022
  cda95f4e Browse Files
- 查看成员详情如果成员部门为空,修复部门数据 · 13330710
  徐高华 authored Oct 08, 2022
  
  13330710 Browse Files
- Merge branch 'master_xgh_pendingid' into 'developer' · d657d45e
```
log

See merge request !289
```
  徐高华 authored Oct 08, 2022
  d657d45e Browse Files
- log · f91ed8c2
  徐高华 authored Oct 08, 2022
  
  f91ed8c2 Browse Files
- feat:区经身份变更为导购，解绑好办 · 6995fda1
  墨竹 authored Oct 08, 2022
  
  6995fda1 Browse Files
- Merge branch 'feature-haoban-role' into developer · a7a1ffef
  墨竹 authored Oct 08, 2022
  
  a7a1ffef Browse Files
- feat:调整分页 · 78dae5e8
  墨竹 authored Oct 08, 2022
  
  78dae5e8 Browse Files
- Merge branch 'feature-haoban-role' into developer · 5e15a98f
  墨竹 authored Oct 08, 2022
  
  5e15a98f Browse Files
- feat:新增获取所有菜单和新增单个菜单接口 · 09dfa993
  墨竹 authored Oct 08, 2022
  
  09dfa993 Browse Files
04 Oct, 2022 2 commits
- Merge branch 'master_xgh_pendingid' into 'developer' · 943c055a
```
Master xgh pendingid

See merge request !288
```
  徐高华 authored Oct 04, 2022
  943c055a Browse Files
- log · 926ccbba
  徐高华 authored Oct 04, 2022
  
  926ccbba Browse Files
03 Oct, 2022 1 commit
- test · 0382f4ba
  徐高华 authored Oct 04, 2022
  
  0382f4ba Browse Files