个税页面固定单位为准  个税类型设置修复小bug 优化个税数据库查询 基本达到满意
Merge remote-tracking branch 'origin/master'

Conflicts:
	module/action/ExtSalaryAction.class.php
	module/dao/SalaryDao.class.php