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

Conflicts:
	WebRoot/company/employee-list.jsp
11
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/salary/CreateSalaryBudgetTable.class
	WebRoot/WEB-INF/classes/cn/fm/bean/salary/SalaryTemplate.class
	WebRoot/WEB-INF/classes/cn/fm/bean/user/WmsUser.class
	WebRoot/WEB-INF/classes/cn/fm/service/base/DAO.class
	WebRoot/WEB-INF/classes/cn/fm/service/company/EnterpriseService.class
	WebRoot/WEB-INF/classes/cn/fm/service/company/impl/EnterpriseServiceImpl.class
	WebRoot/WEB-INF/classes/cn/fm/utils/CookieUtils.class
	WebRoot/WEB-INF/classes/cn/fm/web/action/company/EnterpriseAction.class
	WebRoot/WEB-INF/classes/junit/test/company/EnterpriseServiceTest.class
version 1.0