merge

frontend/saas-web/app/view/money/fundtransfer/FormPanelController.js

@@ -18,11 +18,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             from:'bk_bankname',to:'ftd_bankname'
                         },{
                             from:'id',to:'ftd_bankid',ignore:true
-<<<<<<< HEAD
                         },{
                             from:'bk_thisamount',to:'bk_outthisamount'
-=======
->>>>>>> 5788d1b78e9b65d3ee66cbe9f3cc85383710a4b5
                         }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100