verson 1.0
Merge branch 'master' of https://github.com/jameslin103/wms

Conflicts:
	WebRoot/WEB-INF/classes/cn/fm/bean/utils/AbstractPageQueryUtil.class
	WebRoot/WEB-INF/classes/cn/fm/service/base/SearchImpl.class
	WebRoot/WEB-INF/classes/cn/fm/utils/CommonUtil.class
	WebRoot/WEB-INF/classes/cn/fm/utils/DateUtil.class
	WebRoot/WEB-INF/classes/cn/fm/utils/DateUtilAll.class
	src/cn/fm/service/base/SearchImpl.java
version 1.0