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/bean/company/InsurancesTax.class
	WebRoot/WEB-INF/classes/cn/fm/bean/filter/SessionIterceptor.class
	WebRoot/WEB-INF/classes/cn/fm/bean/salary/BalanceDetail.class
	WebRoot/WEB-INF/classes/cn/fm/bean/salary/CreateSalaryBudgetTable.class
	WebRoot/WEB-INF/classes/cn/fm/bean/salary/EmployeesSalaryDetail.class
	WebRoot/WEB-INF/classes/cn/fm/service/company/EnterpriseEmployeesService.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/BalanceDetailService.class
	WebRoot/WEB-INF/classes/cn/fm/service/salary/CreateSalaryBudgetTableService.class
	WebRoot/WEB-INF/classes/cn/fm/service/salary/EmployeesSalaryDetailService.class
	WebRoot/WEB-INF/classes/cn/fm/service/salary/impl/BalanceDetailServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/service/salary/impl/CreateSalaryBudgetTableServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/service/salary/impl/EmployeesSalaryDetailServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/company/CreateSalaryBudgetTableAction.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/company/CustomBonusAction.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/company/ExportSalaryBudgetByPoiAction.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/company/SalaryTemplateAction.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/ireport/InsuranceEmployeesReportAction.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/cn/fm/web/action/user/LoginAction.class
	WebRoot/WEB-INF/classes/junit/test/company/EmployeesSalaryDetailServiceTest.class
	WebRoot/WEB-INF/classes/junit/test/company/EnterpriseEmployessServiceTest.class
version 1.0