From fbf006ebb7b755700ba6572d6b8bce11862ee7e3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 20 九月 2024 10:23:13 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
index 1434dd0..3d9b309 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
@@ -22,9 +22,6 @@
public class VoRecharge implements BaseEntity {
private static final long serialVersionUID = 1L;
- //@Schema(title = "ID")
- //private String id;
-
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long opeId;
@@ -44,7 +41,7 @@
private String address;
/**
- * 姘村崱浣欓
+ * 姘村崱鏈�缁堜綑棰�
*/
private Float money;
@@ -53,13 +50,22 @@
private Integer cardCost;
- @Schema(title = "鍏呭�奸噾棰�")
+ /**
+ * 鏈鍏呭�奸噾棰�
+ */
private Float amount;
+
+ /**
+ * 鏈璧犻�侀噾棰�
+ */
+ private Float gift;
@Schema(title = "杩斿洖閲戦")
private Float refundAmount;
- @Schema(title = "鍏呭�煎悗閲戦")
+ /**
+ * 鍏呭�煎悗閲戦锛屽厖鍊兼椂浣欓 + 鏈鍏呭�奸噾棰� + 鏈璧犻�侀噾棰�
+ */
private Float afterRecharge;
@Schema(title = "鏀粯鏂瑰紡")
--
Gitblit v1.8.0