Entity framework
fix bug
Merge branch 'feature/wei-EntityFramework'