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

8d2c5dc6 · 25484 · 0b2bc56d · 18aac4e8 · 8d2c5dc6
Commit 8d2c5dc6 authored Nov 15, 2019 by 25484
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

csh_payment_req_selected.lwm ...p/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm +2 -2

No files found.
--- a/src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
+++ b/src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
@@ -159,8 +159,8 @@
                   from hls_bp_master
                  where hls_bp_master.bp_id = t.bp_id_agent_level1) bp_id_agent_n,
                --查找厂商
-                (SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n
-
+                (SELECT bp_name FROM hls_bp_master h WHERE h.bp_id=hli.vender_id) vender_name_n,
+                hli.vender_name
           FROM con_contract_cashflow   f,
                hls_cashflow_item       h,
                con_contract_lease_item i,