1.增加jpa native 查询，
2.自定义json类，用于返回
Merge remote-tracking branch 'origin/master'