From a78ac968018e42634cfb37a6a1ef3aa2dd10acc9 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 03 四月 2025 15:20:03 +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 | 12 +++++++++++-
1 files changed, 11 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 da459cd..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;
/**
* 支付流水号
@@ -41,6 +41,11 @@
*/
@TableField("payType")
private Integer payType;
+ /**
+ * 支付单价
+ */
+ @TableField("unitPrice")
+ private BigDecimal unitPrice;
/**
* 支付金额
*/
@@ -72,6 +77,11 @@
@TableField("refundOrderNo")
private String refundOrderNo;
/**
+ * 退款金额
+ */
+ @TableField("refundAmount")
+ private BigDecimal refundAmount;
+ /**
* 状态（1=正常，2=冻结，3=删除）
*/
@TableField("state")
--
Gitblit v1.7.1