user.js终于正常了
Merge remote-tracking branch 'origin/master'