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

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_record_query.lwm

@@ -130,7 +130,7 @@
         <bm:data-filter name="query" expression="((t1.ref_contract_id is not null and t1.source_type is not null) or
           exists (select hm.bp_id
           from hls_bp_master hm
-         where hm.bp_code = 'D00010020'
+         where hm.bp_code in('D00010020','D00010023')
            and hm.bp_id = t1.bp_id
            and t1.collection_classes = 'DEPOSIT'
            and t1.paid_byother_flag = 'F'))"/>