Fix little bug See merge request !10
Zhaoyue dev See merge request !9
Zhaoyue dev4 See merge request !7
Fix names 删除了一些重复的entity文件,对相应功能做了合并。 See merge request !6