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

Conflicts:
	WebRoot/WEB-INF/classes/cn/fm/bean/company/Enterprise.class
	WebRoot/WEB-INF/classes/cn/fm/bean/salary/CreateSalaryBudgetTable.class
	WebRoot/WEB-INF/classes/cn/fm/bean/user/WmsUser.class
	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/CreateSalaryBudgetTableService.class
	WebRoot/WEB-INF/classes/cn/fm/service/salary/impl/CreateSalaryBudgetTableServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/BaseAction.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/company/CreateSalaryBudgetTableAction.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/BalanceDetailAction.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/salary/CompanylistWithSalaryAction.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/salary/EmployeesSalaryDetailAction.class
	WebRoot/WEB-INF/classes/junit/test/company/CreateSalaryBudgetTableServictTest.class
	WebRoot/WEB-INF/classes/junit/test/company/EnterpriseServiceTest.class
	src/cn/fm/web/action/salary/EmployeesSalaryDetailAction.java
version
version 1.0
Merge branch 'master' of https://github.com/jameslin103/wms

Conflicts:
	WebRoot/WEB-INF/classes/cn/fm/bean/company/Enterprise.class
	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/BaseAction.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/company/EnterpriseEmployeesAction.class
	WebRoot/WEB-INF/classes/junit/test/company/EnterpriseEmployessServiceTest.class
	src/cn/fm/web/action/company/EnterpriseEmployeesAction.java
verson 1.0