changing to sites
把登录改为传统模式
fix conflicts
Merge remote-tracking branch 'origin/master' into pzhyy