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

hx-account/src/main/java/com/fjhx/account/entity/write/vo/WriteOffRecordsVo.java

@@ -37,6 +37,14 @@ public class WriteOffRecordsVo extends WriteOffRecords {
      * 申请金额
      */
     private BigDecimal amount;
+    /**
+     * 币种
+     */
+    private String currency;
+    /**
+     * 打款业务id
+     */
+    private Long businessId;
 
     /**
      * 归属公司名称

hx-account/src/main/resources/mapper/write/WriteOffRecordsMapper.xml

@@ -12,6 +12,8 @@
                wor.update_time,
                ap.corporation_id,
                ap.type,
+               ap.currency,
+               ap.business_id,
                if(type!=20,
                   (SELECT GROUP_CONCAT(t4.`code`)
                    FROM account_request_funds t2