Commits · 9a9a62e3e078461138ba04c23898c8adbffec6e5 · haoban3.0 / haoban-manage3.0 · GitLab

15 Sep, 2022 11 commits
- Merge branch 'feat-0919' into developer · 9a9a62e3
  墨竹 authored Sep 15, 2022
  
  9a9a62e3 Browse Files
- fix:删除门店好友关系解除 · ddabacbf
  墨竹 authored Sep 15, 2022
  
  ddabacbf Browse Files
- Merge branch 'feat-0919' into developer · 1f37f68e
  墨竹 authored Sep 15, 2022
  
  1f37f68e Browse Files
- fix:空指针修改 · 6f2c28dd
  墨竹 authored Sep 15, 2022
  
  6f2c28dd Browse Files
- Merge branch 'feat-0919' into developer · 41925e35
  墨竹 authored Sep 15, 2022
  
  41925e35 Browse Files
- fix:解绑入口统一，并将好友关系解除通知会员 · 25157c99
  墨竹 authored Sep 15, 2022
  
  25157c99 Browse Files
- fix:解绑入口统一，并将好友关系解除通知会员 · 634e9590
  墨竹 authored Sep 15, 2022
  
  634e9590 Browse Files
- Merge branch 'feat-0919' into developer · 74e2f8f4
  墨竹 authored Sep 15, 2022
  
  74e2f8f4 Browse Files
- fix:会员删除导购bug修改 · ac3c4ab5
  墨竹 authored Sep 15, 2022
  
  ac3c4ab5 Browse Files
- Merge branch 'feature-haoban-role' into developer · 9f4f0459
  墨竹 authored Sep 15, 2022
  
  9f4f0459 Browse Files
- feat:权限接口调整 · a88be709
  墨竹 authored Sep 15, 2022
  
  a88be709 Browse Files
14 Sep, 2022 12 commits
- Merge branch 'feature-haoban-role' into developer · afc14be1
  墨竹 authored Sep 14, 2022
  
  afc14be1 Browse Files
- fix:权限菜单树 · 45cf3fd4
  墨竹 authored Sep 14, 2022
  
  45cf3fd4 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
- 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
- feat:权限新增接口 · b4e28246
  墨竹 authored Sep 14, 2022
  
  b4e28246 Browse Files
- feat:新增接口 · b19562ba
  墨竹 authored Sep 14, 2022
  
  b19562ba Browse Files
- feat:小程序生成默认权限 · 4c03761d
  墨竹 authored Sep 14, 2022
  
  4c03761d Browse Files
- Merge branch 'developer' into feature-haoban-role · 7a41a380
  墨竹 authored Sep 14, 2022
  
  7a41a380 Browse Files
13 Sep, 2022 17 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
- Merge branch 'master-xgh-好办停用' into 'developer' · 8fe3b6ba
```
log

See merge request !238
```
  徐高华 authored Sep 13, 2022
  8fe3b6ba Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · fab694a8
  墨竹 authored Sep 13, 2022
  
  fab694a8 Browse Files
- feat:恢复代码 · 6d228b2a
  墨竹 authored Sep 13, 2022
  
  6d228b2a Browse Files
- log · 931fef35
  徐高华 authored Sep 13, 2022
  
  931fef35 Browse Files
- Merge remote-tracking branch 'origin/master-xgh-好办停用' into developer · 1ff8ebe7
```
Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
```
  徐高华 authored Sep 13, 2022
  1ff8ebe7 Browse Files
- 好友删导购 · b1e22ff2
  徐高华 authored Sep 13, 2022
  
  b1e22ff2 Browse Files
- Merge branch 'developer' into feature-haoban-role · 5d9ee194
```
# Conflicts:
#	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
#	haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
```
  墨竹 authored Sep 13, 2022
  5d9ee194 Browse Files
- log · 5939eb06
  徐高华 authored Sep 13, 2022
  
  5939eb06 Browse Files
- log · eba470d8
  徐高华 authored Sep 13, 2022
  
  eba470d8 Browse Files
- feat:合并代码 · 4c0f3a70
  墨竹 authored Sep 13, 2022
  
  4c0f3a70 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 7e853a28
  墨竹 authored Sep 13, 2022
  
  7e853a28 Browse Files
- Merge branch 'feat-0919' into developer · 14a6f9a5
```
# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
```
  墨竹 authored Sep 13, 2022
  14a6f9a5 Browse Files
- Merge branch 'master-xgh-好办停用' into 'developer' · 5501838e
```
log

See merge request !236
```
  徐高华 authored Sep 13, 2022
  5501838e Browse Files
- log · f70b8a27
  徐高华 authored Sep 13, 2022
  
  f70b8a27 Browse Files