Commits · 2870095ded6bf5d4ebb1970c3a88ee79199e7041 · haoban3.0 / haoban-manage3.0 · GitLab

03 Oct, 2022 5 commits
- 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 17 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
- 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 15 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