liuchao
liuchao
Merge branch 'master' of https://github.com/18301551026/tour.git

Conflicts:
	oa-core/src/main/java/com/lxs/security/domain/User.java
	pom.xml