1.去掉了administrator的id
Merge remote-tracking branch 'origin/master'