Merge branch 'master' of https://github.com/liuyongzhi/gyyx

Conflicts:
	logic/.project
	logic/pom.xml
	logic/src/main/java/cn/gyyx/manage/base/BaseMapper.java
	logic/src/main/java/cn/gyyx/manage/bll/UserBLL.java
	logic/src/main/java/cn/gyyx/manage/bll/UserLogBLL.java
	logic/src/main/java/cn/gyyx/manage/dao/UserDao.java
	logic/src/main/java/cn/gyyx/manage/dao/UserLogDao.java
	logic/src/main/java/cn/gyyx/manage/service/UserService.java
	logic/src/test/java/cn/gyyx/manage/test/ConnTest.java
	ui/pom.xml
	ui/src/main/java/cn/gyyx/manage/controller/UserController.java
	ui/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
	ui/src/main/webapp/WEB-INF/web.xml
Merge branch 'master' of https://github.com/liuyongzhi/gyyx

Conflicts:
	logic/.project