添加逻辑判断
Merge branch 'master' of github.com:JacksonTian/lina