- 
fix:修改意见反馈,qq验证 See merge request huang/thingskit-app!52 
- 
修改滚动的一系列问题,和其他问题 See merge request huang/thingskit-app!51 
- 
fix:修改个人资料用户账号不能编辑,fix:修改通知分页停留在滚动位置 See merge request huang/thingskit-app!50 
- 
'fix:固定滚动' See merge request huang/thingskit-app!49 
- 
fix:修改通知分页前端判断状态 See merge request huang/thingskit-app!48 
- 
# Conflicts: # publicLoginSubPage/other/code.vue # publicLoginSubPage/other/findPassword.vue # publicLoginSubPage/other/static/code.scss # publicLoginSubPage/public/login.vue 
- 
fix:修改第三方登录获取openid 合并冲突 See merge request huang/thingskit-app!46