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

Conflicts:
	WebRoot/WEB-INF/classes/cn/fm/bean/company/EnterpriseEmployees.class
	WebRoot/WEB-INF/classes/cn/fm/service/company/EnterpriseEmployeesService.class
	WebRoot/WEB-INF/classes/cn/fm/service/company/impl/EnterpriseEmployeesServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/company/EnterpriseEmployeesAction.class
	WebRoot/WEB-INF/classes/junit/test/company/EnterpriseEmployessServiceTest.class