Merge remote-tracking branch 'origin/remote_dev' into remote_dev

src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_agent_lov.lwm

@@ -19,6 +19,7 @@
         <bm:field name="bp_class" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS"/>
         <bm:field name="bp_class_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS_NAME"/>
         <bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG"/>
+        <bm:field name="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXTRA_NAM"/>
         <!--<bm:field name="id_card_no" displayWidth="200" forDisplay="true" prompt="身份证"/>-->
     </bm:fields>
     <bm:features>

src/main/webapp/WEB-INF/classes/csh/CSH1400/csh_abc_import_save.lwm

@@ -16,6 +16,7 @@
                 p_payer_number =>${@payer_number},
                 p_bank_name =>${@bank_name},
                 p_beneficiary_name =>${@beneficiary_name},
+                p_bp_id =>${@bp_id},
                 p_total_amount =>${@total_amount},
                 p_import_itfc_id =>${@import_itfc_id});
 

src/main/webapp/WEB-INF/classes/efile/EFILE1100/att_import_bank.lwm

@@ -28,7 +28,8 @@
                 p_response_json => ${@response_json},
                 p_return_page_size => ${@return_page_size},
                 p_page_size => ${@page_size},
-                p_user_id =>${/session/@user_id}
+                p_user_id =>${/session/@user_id},
+                p_slip_batch_id => ${@slip_batch_id}
                 );
                 END;
                 ]]>

src/main/webapp/WEB-INF/classes/efile/EFILE1100/get_bank_list.lwm

@@ -6,6 +6,7 @@
                 SELECT *
                 FROM  hlcm_ele_abc_bank_slip_bacth b
                 WHERE  b.start_date = TO_DATE('${:@parameter_code}', 'YYYY-MM-DD')
+                ORDER BY b.slip_batch_id desc
                 ]]></bm:query-sql>
         </bm:operation>
     </bm:operations>