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

Conflicts:
	WebRoot/WEB-INF/classes/cn/fm/service/company/EnterpriseService.class
	WebRoot/WEB-INF/classes/cn/fm/service/company/impl/EnterpriseEmployeesServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/service/company/impl/EnterpriseServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/service/salary/impl/EmployeesSalaryDetailServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/company/EnterpriseAction.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/company/EnterpriseEmployeesAction.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/salary/CompanylistWithSalaryAction.class
	WebRoot/WEB-INF/classes/junit/test/company/EnterpriseServiceTest.class
	src/cn/fm/service/company/EnterpriseService.java
version 1.0