Merge branch 'master' of https://github.com/zhoukekestar/zkk-module

Conflicts:
	src/main/mybatis/com/zhoukekestar/mybatis/config/conf.xml
	src/main/mybatis/com/zhoukekestar/mybatis/config/jdbc.properties
	src/main/mybatis/com/zhoukekestar/mybatis/dao/impl/UserImpl.java
	src/main/mybatis/com/zhoukekestar/mybatis/dao/impl/_BaseDaoImpl.java
	src/main/mybatis/com/zhoukekestar/mybatis/test/App.java
Merge branch 'master' of https://github.com/zhoukekestar/zkk-module