Signed-off-by: ricklkl <rick.li@ys-os.com>
Signed-off-by: ricklkl <rick.li@ys-os.com>
Merge branch 'master' of git@github.com:ricklkl/cbj-server.git

Conflicts:
	pom.xml
	src/main/java/com/rick/cbj/dao/impl/UserDaoImpl.java