Merge branch 'refs/heads/feature/payment' into develop

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_excel_bank_info.lwm

@@ -15,6 +15,11 @@
                         FROM hls_bp_master_bank_account hbbc
                         WHERE hbbc.bank_account_id=V.bp_bank_account_id
                        ) agent_bank_name,
+                       --代理商名称
+                       (SELECT bp_name
+                          FROM hls_bp_master hbm,hls_bp_master_bank_account hbbc
+                          WHERE hbm.bp_id = hbbc.bp_id
+                             AND hbbc.bank_account_id=v.bp_bank_account_id) agent_name,
                      --应付我司开户行
                      (SELECT HBBc.bank_account_name
                         FROM HLS_BP_MASTER_BANK_ACCOUNT HBBC

src/main/webapp/WEB-INF/leaf.plugin.export.word/payment_apply_content.xml

@@ -219,10 +219,10 @@
 			<t fontFamily="宋体" fontSize="20" fontColor="000000" >账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''}				                              账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t>
 		</p>
 		<p indFirstLine="1" line="400" >
-			<t fontFamily="宋体" fontSize="20" fontColor="000000" >委托收款人确认金额无误				                     委托公司名称:${model.getObject('/model/bank_info/record/@vender_name')!''}</t>
+			<t fontFamily="宋体" fontSize="20" fontColor="000000" >委托收款人确认金额无误				                     委托公司名称:${model.getObject('/model/bank_info/record/@agent_name')!''}</t>
 		</p>
 		<p  indFirstLine="1" line="400" >
-			<t fontFamily="宋体" fontSize="20" fontColor="000000" >收款人:日立建机（上海）有限公司（盖章)				     申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t>
+			<t fontFamily="宋体" fontSize="20" fontColor="000000" >收款人:${model.getObject('/model/bank_info/record/@vender_name')!''}				     申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t>
 		</p>
 		<p indFirstLine="9" line="400">
 			<t fontFamily="宋体" fontSize="20" fontColor="000000">                                                               确认日期:</t>