Commits · 1dfe38e72c69a5dc41300e16a4ebe001bf4917f4 · haoban3.0 / haoban-manage3.0 · GitLab

27 Apr, 2022 3 commits
- Merge branch 'master' into developer · 1dfe38e7
  墨竹 authored Apr 27, 2022
  
  1dfe38e7 Browse Files
- fix：bug修改 · a1cc067b
  墨竹 authored Apr 27, 2022
  
  a1cc067b Browse Files
- fix：增加注释 · 784c1394
  墨竹 authored Apr 27, 2022
  
  784c1394 Browse Files
26 Apr, 2022 7 commits
- Merge remote-tracking branch 'origin/developer' into developer · 059ab7fb
  墨竹 authored Apr 26, 2022
  
  059ab7fb Browse Files
- Merge branch 'feature-04-26' into developer · df3f461d
  墨竹 authored Apr 26, 2022
  
  df3f461d Browse Files
- fix：离职继承改为消息队列 · 049d60db
  墨竹 authored Apr 26, 2022
  
  049d60db Browse Files
- Merge branch 'feature/权限' into 'developer' · 00e5701f
```
好办权限

See merge request !173
```
  徐高华 authored Apr 26, 2022
  00e5701f Browse Files
- 好办权限 · f5255290
  徐高华 authored Apr 26, 2022
  
  f5255290 Browse Files
- Merge branch 'feature-04-26' into developer · 66b22dc9
  墨竹 authored Apr 26, 2022
  
  66b22dc9 Browse Files
- fix：模糊搜索 · a61fd045
  墨竹 authored Apr 26, 2022
  
  a61fd045 Browse Files
25 Apr, 2022 14 commits
- Merge branch 'feature-04-26' into developer · 075d7fab
  墨竹 authored Apr 25, 2022
  
  075d7fab Browse Files
- fix：增加日志 · d1f1b919
  墨竹 authored Apr 25, 2022
  
  d1f1b919 Browse Files
- Merge branch 'feature-04-26' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer · 974001bc
  墨竹 authored Apr 25, 2022
  
  974001bc Browse Files
- fix：分页修改 · 1b07bcf0
  墨竹 authored Apr 25, 2022
  
  1b07bcf0 Browse Files
- Merge branch 'feature-04-26' into developer · eb828904
  墨竹 authored Apr 25, 2022
  
  eb828904 Browse Files
- fix：ResponseInterceptor修改 · 2dba08f3
  墨竹 authored Apr 25, 2022
  
  2dba08f3 Browse Files
- Merge branch 'feature-04-26' into developer · dc0f40df
  墨竹 authored Apr 25, 2022
  
  dc0f40df Browse Files
- fix：标签bug修改 · 5185fb98
  墨竹 authored Apr 25, 2022
  
  5185fb98 Browse Files
- fix：标签bug修改 · f02d5801
  墨竹 authored Apr 25, 2022
  
  f02d5801 Browse Files
- Merge branch 'feature-04-26' into developer · 8a5dc075
  墨竹 authored Apr 25, 2022
  
  8a5dc075 Browse Files
- fix：合并会员和删除会员后通知会员更新企微好友状态 · 6afd450b
  墨竹 authored Apr 25, 2022
  
  6afd450b Browse Files
- fix：更改备注 · efb191c9
  墨竹 authored Apr 25, 2022
  
  efb191c9 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · de005417
  墨竹 authored Apr 25, 2022
  
  de005417 Browse Files
- fix：更改备注 · 8724836d
  墨竹 authored Apr 25, 2022
  
  8724836d Browse Files
24 Apr, 2022 4 commits
- Merge branch 'feature/权限' into 'developer' · 613231d4
```
登录

See merge request !172
```
  徐高华 authored Apr 24, 2022
  613231d4 Browse Files
- 登录 · 90934b96
  徐高华 authored Apr 24, 2022
  
  90934b96 Browse Files
- fix：代码公用 · c2806b44
  墨竹 authored Apr 24, 2022
  
  c2806b44 Browse Files
- fix：添加好友修改 · 61a23544
  墨竹 authored Apr 24, 2022
  
  61a23544 Browse Files
22 Apr, 2022 2 commits
- fix：增加提示 · 3985f9fc
  墨竹 authored Apr 22, 2022
  
  3985f9fc Browse Files
- fix：空指针修改 · 95789ee7
  墨竹 authored Apr 22, 2022
  
  95789ee7 Browse Files
21 Apr, 2022 7 commits
- Merge branch 'master' into developer · 083accb9
  墨竹 authored Apr 21, 2022
  
  083accb9 Browse Files
- fix：关闭连接 · 61c8d97a
  墨竹 authored Apr 21, 2022
  
  61c8d97a Browse Files
- fix：提示报错 · 4c852d9c
  墨竹 authored Apr 21, 2022
  
  4c852d9c Browse Files
- fix：提供service服务 · ee104202
  墨竹 authored Apr 21, 2022
  
  ee104202 Browse Files
- fix：报错修改 · 0f5b0df1
  墨竹 authored Apr 21, 2022
  
  0f5b0df1 Browse Files
- Merge branch 'fixbug_0421' into developer · 6fff9a09
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
#	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 Apr 21, 2022
  6fff9a09 Browse Files
- fix：增加接口，查询是否有企微好友接口 · fa8f4662
  墨竹 authored Apr 21, 2022
  
  fa8f4662 Browse Files
20 Apr, 2022 3 commits
- Merge branch 'master' into developer · 0c3d5870
  墨竹 authored Apr 20, 2022
  
  0c3d5870 Browse Files
- fix：员工列表返回导购code · a32f964b
  墨竹 authored Apr 20, 2022
  
  a32f964b Browse Files
- Merge branch 'master' into developer · a7d7c132
  墨竹 authored Apr 20, 2022
  
  a7d7c132 Browse Files