integrate mybatis
Merge branch 'integrate_mybatis' into dev