修改了model和hibernate的hbm文件
Merge remote-tracking branch 'origin/master'