增加个税统计by瑞鹏
Merge remote-tracking branch 'origin/master'

Conflicts:
	module/action/SaveSalaryAction.class.php
	tpl/ext/js/data.js
	tpl/ext/js/model.js