Merge remote-tracking branch 'origin/milestone-20260113-现金管理0109' into milestone-20260113-现金管理0109

1 month ago · 40451c500e
2 changed files with 6 additions and 0 deletions
--- a/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java
+++ b/src/main/java/com/example/demo/domain/vo/cash/FundsDTO.java
@ -63,4 +63,8 @@ public class FundsDTO {
    private String token;
    @ExcelIgnore
    private String lang;
+    @ExcelIgnore
+    private BigDecimal permanentGold;
+    @ExcelIgnore
+    private BigDecimal freeGold;
 }
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@ -426,6 +426,8 @@
        crc.received_currency,
        crc.received_amount,
        crc.handling_charge,
+        crc.permanent_gold,
+        crc.free_gold,
        crc.pay_type,
        crc.pay_time,
        crc.status