numbers are fixed
Merge branch 'master' of github.com:kymtwyf/TravelSteward
改成百分比
Merge branch 'master' of github.com:kymtwyf/TravelSteward

Conflicts:
	WebContent/css/style.css
	WebContent/manager/AnalysisByMonth.view.js
	WebContent/manager/analysisByCity.view.js
	WebContent/travelsteward/StaffNewReqPage.controller.js
some origins
Merge branch 'master' of github.com:kymtwyf/TravelSteward