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

Conflicts:
	oa-core/src/main/java/com/lxs/core/common/TimeUtil.java
liuchao
2014-1-15确认功能