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

08 Oct, 2022 18 commits
- 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
- 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 9 commits
- test · 0382f4ba
  徐高华 authored Oct 04, 2022
  
  0382f4ba Browse Files
- Merge branch 'master_xgh_pendingid' into 'developer' · 69b9e4ae
```
Master xgh pendingid

See merge request !287
```
  徐高华 authored Oct 03, 2022
  69b9e4ae Browse Files
- unionid表优化 · 6a33791c
  徐高华 authored Oct 03, 2022
  
  6a33791c Browse Files
- unionid表优化 · 8675cbcb
  徐高华 authored Oct 03, 2022
  
  8675cbcb Browse Files
- Merge branch 'master_xgh_pendingid' into 'developer' · 2870095d
```
Master xgh pendingid

See merge request !286
```
  徐高华 authored Oct 03, 2022
  2870095d Browse Files
- test · 737fffe5
  徐高华 authored Oct 03, 2022
  
  737fffe5 Browse Files
- test · 1a075121
  徐高华 authored Oct 03, 2022
  
  1a075121 Browse Files
- Merge branch 'master_xgh_pendingid' into 'developer' · 556c6d0a
```
Master xgh pendingid

See merge request !285
```
  徐高华 authored Oct 03, 2022
  556c6d0a Browse Files
- 加好友 · 55ff8800
  徐高华 authored Oct 03, 2022
  
  55ff8800 Browse Files
30 Sep, 2022 3 commits
- test · 0b8823f9
  徐高华 authored Sep 30, 2022
  
  0b8823f9 Browse Files
- Merge branch 'master_xgh_pendingid' into 'developer' · 618e1470
```
加好友整理

See merge request !284
```
  徐高华 authored Sep 30, 2022
  618e1470 Browse Files
- 加好友整理 · 29e72320
  徐高华 authored Sep 30, 2022
  
  29e72320 Browse Files
29 Sep, 2022 8 commits
- Merge branch 'feature-haoban-role' into developer · 2438a1fe
  墨竹 authored Sep 29, 2022
  
  2438a1fe Browse Files
- fix:sql报错 · 4395bd90
  墨竹 authored Sep 29, 2022
  
  4395bd90 Browse Files
- Merge branch 'feature-haoban-role' into developer · 92669709
  墨竹 authored Sep 29, 2022
  
  92669709 Browse Files
- fix:区经，我的相关接口改为门店列表 · 1fe64792
  墨竹 authored Sep 29, 2022
  
  1fe64792 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 07b041db
  墨竹 authored Sep 29, 2022
  
  07b041db Browse Files
- Merge branch 'feature-haoban-role' into developer · 717c1129
  墨竹 authored Sep 29, 2022
  
  717c1129 Browse Files
- fix:区经，我的相关接口改为门店列表 · 34e27c50
  墨竹 authored Sep 29, 2022
  
  34e27c50 Browse Files
- Merge branch 'master_xgh_pendingid' into 'developer' · cf9ae6b7
```
Master xgh pendingid

See merge request !283
```
  徐高华 authored Sep 29, 2022
  cf9ae6b7 Browse Files