修正没有全局变量的bug
Merge branch 'app' into develop