增加数据层实体类
Merge remote-tracking branch 'origin/master'