Merge branch 'dev' into dev-g

2026-05-04 01:50:17 +08:00 · 2025-06-24 16:14:20 +08:00
parent be575314bf 53e39ce17b
commit fe8c013bf3
20 changed files with 1766 additions and 69 deletions
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java
@@ -248,6 +248,11 @@ public class OrderListVO {
    @Excel(name = "结算金额")
    private String settleAmount;

+    /**
+     * 实收金额
+     */
+    private BigDecimal actualReceivedAmount;
+
    /**
     * 交易服务费/通道手续费
     */