Zhaoyue dev4 See merge request !7
Fix names 删除了一些重复的entity文件,对相应功能做了合并。 See merge request !6
MOD move some code from controller to service See merge request !4
FIX some conflicts See merge request !3