释放按钮功能
Merge branch 'master' of https://github.com/caining618/ytf_risk.git

Conflicts:
	WebContent/app/view/risk/TxnList.js
银联预警详细功能
Merge branch 'master' of https://github.com/caining618/ytf_risk.git

Conflicts:
	WebContent/app/view/risk/TxnList.js
详细按钮工鞥修改
差错调单详细按钮功能
操作详细按钮功能
Merge branch 'master' of https://github.com/caining618/ytf_risk.git

Conflicts:
	WebContent/app/view/risk/TxnList.js
差错详细
Merge branch 'master' of https://github.com/caining618/ytf_risk.git

Conflicts:
	WebContent/app/view/risk/TxnList.js
差错详细
详细按钮
Merge branch 'master' of https://github.com/caining618/ytf_risk.git

Conflicts:
	WebContent/app/view/risk/TxnList.js
详细功能
增加分页参数
Merge branch 'master' of https://github.com/caining618/ytf_risk.git

Conflicts:
	src/com/yeepay/action/risk/FindRiskAction.java