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

18 Apr, 2022 10 commits
- Merge branch 'feature-04-26' into developer · 0f25fc60
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java
```
  墨竹 authored Apr 18, 2022
  0f25fc60 Browse Files
- fix：增加企微报错日志表 · 037d1d98
  墨竹 authored Apr 18, 2022
  
  037d1d98 Browse Files
- fix：默认返回模板 · b5bd4190
  墨竹 authored Apr 18, 2022
  
  b5bd4190 Browse Files
- fix：默认返回模板 · 734e0a86
  墨竹 authored Apr 18, 2022
  
  734e0a86 Browse Files
- fix：登录bug修改 · 5b76aa85
  墨竹 authored Apr 18, 2022
  
  5b76aa85 Browse Files
- Merge branch 'developer' into feature-04-26 · 2301b10a
  墨竹 authored Apr 18, 2022
  
  2301b10a Browse Files
- fix：登录bug修改 · ff4e2053
  墨竹 authored Apr 18, 2022
  
  ff4e2053 Browse Files
- Merge branch 'feature_0418' into developer · c7429a21
  墨竹 authored Apr 18, 2022
  
  c7429a21 Browse Files
- fix：企微通讯录回调部门修改 · 1bf081fb
  墨竹 authored Apr 18, 2022
  
  1bf081fb Browse Files
- fix：企微好友异常，dingding不提示 · 3ce80451
  墨竹 authored Apr 18, 2022
  
  3ce80451 Browse Files
15 Apr, 2022 7 commits
- fix：登录修改 · e0c95c57
  墨竹 authored Apr 15, 2022
  
  e0c95c57 Browse Files
- fix：标签同步增加限制 · debcf8e2
  墨竹 authored Apr 15, 2022
  
  debcf8e2 Browse Files
- fix：增加对外提供会员是否有好友接口 · e2a06cea
  墨竹 authored Apr 15, 2022
  
  e2a06cea Browse Files
- fix：登录修改 · 9f473ac6
  墨竹 authored Apr 15, 2022
  
  9f473ac6 Browse Files
- fix：登录游客返回-1 · 6af2cb73
  墨竹 authored Apr 15, 2022
  
  6af2cb73 Browse Files
- Merge branch 'master' into developer · d891d02e
```
# Conflicts:
#	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/SendCodeController.java
```
  墨竹 authored Apr 15, 2022
  d891d02e Browse Files
- fix：增加日志 · 785816c9
  墨竹 authored Apr 15, 2022
  
  785816c9 Browse Files
14 Apr, 2022 9 commits
- Merge remote-tracking branch 'origin/developer' into developer · 1812837a
  墨竹 authored Apr 15, 2022
  
  1812837a Browse Files
- fix：空判断 · 31b602e4
  墨竹 authored Apr 15, 2022
  
  31b602e4 Browse Files
- fix：空判断 · 997c3097
  墨竹 authored Apr 15, 2022
  
  997c3097 Browse Files
- fix：空判断 · fc359d00
  墨竹 authored Apr 15, 2022
  
  fc359d00 Browse Files
- fix：空判断 · 67c99e99
  墨竹 authored Apr 15, 2022
  
  67c99e99 Browse Files
- fix：空判断 · 3751ebd9
  墨竹 authored Apr 14, 2022
  
  3751ebd9 Browse Files
- fix：空判断 · aaf3bdca
  墨竹 authored Apr 14, 2022
  
  aaf3bdca Browse Files
- fix：空判断 · eecbcdef
  墨竹 authored Apr 14, 2022
  
  eecbcdef Browse Files
- fix：登录游客修改 · e50bb843
  墨竹 authored Apr 14, 2022
  
  e50bb843 Browse Files
13 Apr, 2022 5 commits
- fix：鸿星尔克定制bug · 4d1f0581
  墨竹 authored Apr 13, 2022
  
  4d1f0581 Browse Files
- fix：鸿星尔克定制 · cdedd749
  墨竹 authored Apr 13, 2022
  
  cdedd749 Browse Files
- fix：鸿星尔克定制 · 93482de5
  墨竹 authored Apr 13, 2022
  
  93482de5 Browse Files
- Merge branch 'developer' into feature-04-26 · 83881a13
  墨竹 authored Apr 13, 2022
  
  83881a13 Browse Files
- fix：鸿星尔克定制 · 59882bca
  墨竹 authored Apr 13, 2022
  
  59882bca Browse Files
12 Apr, 2022 3 commits
- Merge branch 'fixbug_0412' into developer · 0c08587c
  墨竹 authored Apr 12, 2022
  
  0c08587c Browse Files
- fix：离职继承bug修改 · 66490fbb
  墨竹 authored Apr 12, 2022
  
  66490fbb Browse Files
- fix：待办模板更改 · 961aad9c
  墨竹 authored Apr 12, 2022
  
  961aad9c Browse Files
11 Apr, 2022 1 commit
- fix：删除导购报错 · 64aafc3c
  墨竹 authored Apr 11, 2022
  
  64aafc3c Browse Files
08 Apr, 2022 1 commit
- refactor：超时时间延长 · 71b54946
  墨竹 authored Apr 08, 2022
  
  71b54946 Browse Files
07 Apr, 2022 1 commit
- refactor：超时时间延长 · 0d51558f
  墨竹 authored Apr 07, 2022
  
  0d51558f Browse Files
01 Apr, 2022 3 commits
- fix：暂时注释该代码 · 683c057a
  墨竹 authored Apr 01, 2022
  
  683c057a Browse Files
- refactor：设置主门店bug修复 · 6359ae6e
  墨竹 authored Apr 01, 2022
  
  6359ae6e Browse Files
- refactor：设置主门店bug修复 · ab54fbeb
  墨竹 authored Apr 01, 2022
  
  ab54fbeb Browse Files