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

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -163,7 +163,8 @@
                pad.remark         remarks,
                am.`name`          accountManagementName,
                am.account_opening accountManagementOpening,
-               arw.`name`
+               arw.`name`,
+               arw.status
         FROM contract c
                  JOIN bytesailing_purchase.purchase p ON p.data_resource_id = c.id AND p.del_flag = 0
                  JOIN bytesailing_purchase.pay_detail `pad` ON pad.purchase_id = p.id AND pad.del_flag = 0
@@ -182,7 +183,8 @@
                arfd.remarks,
                am.`name`          accountManagementName,
                am.account_opening accountManagementOpening,
-               arw.`name`
+               arw.`name`,
+               arw.status
         FROM contract c
                  JOIN bytesailing_account.account_request_funds_detail arfd
                       ON arfd.contract_id = c.id AND arfd.del_flag = 0
@@ -201,7 +203,8 @@
                arw.remarks,
                am.`name`          accountManagementName,
                am.account_opening accountManagementOpening,
-               arw.`name`
+               arw.`name`,
+               arw.status
         FROM bytesailing_account.account_running_water arw
                  JOIN claim cl ON cl.business_id = arw.id
                  JOIN claim_contract clc ON clc.claim_id = cl.id