test
Merge branch 'dev'
二维码扫描不清空activity栈表,bug
bug修复