pull to master and m1
Merge remote-tracking branch 'origin/M1'
更新entity
Merge pull request #5 from luoatc/master

更新entity