From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPayment.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPayment.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPayment.java
index edeeddf..cd5fcc0 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPayment.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/entity/WorldCupPayment.java
@@ -19,7 +19,7 @@
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.INPUT)
+    @TableId(value = "id", type = IdType.NONE)
     private Long id;
     /**
      * 支付流水号
@@ -77,6 +77,11 @@
     @TableField("refundOrderNo")
     private String refundOrderNo;
     /**
+     * 退款金额
+     */
+    @TableField("refundAmount")
+    private BigDecimal refundAmount;
+    /**
      * 状态(1=正常,2=冻结,3=删除)
      */
     @TableField("state")

--
Gitblit v1.7.1