small refactoring
Merge branch 'm1.mybatis' into m2.properties
small refactoring
Merge branch 'm2.properties' into m2.entitylifecycle