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

Conflicts:
	WebRoot/WEB-INF/classes/cn/fm/web/action/company/ExportSalaryBudgetByPoiAction.class
	WebRoot/WEB-INF/classes/junit/test/company/CreateSalaryBudgetTableServictTest.class
	WebRoot/WEB-INF/classes/struts.xml
	src/cn/fm/web/action/company/ExportSalaryBudgetByPoiAction.java
	src/junit/test/company/CreateSalaryBudgetTableServictTest.java
	src/struts.xml
version 1.0 honme