From 7a2fa8d7481a3eb0a39dc9e434776b7ae05013b0 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 03 七月 2024 08:44:16 +0800
Subject: [PATCH] 2024-07-03 朱宝民 获取充值记录兼容10位水卡编号

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 e423945..3329dc1 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
@@ -21,13 +21,22 @@
     private static final long serialVersionUID = 1L;
 
     @Schema(title = "ID")
-    private Long id;
+    private String id;
 
     @Schema(title = "鍐滄埛濮撳悕")
     private String clientName;
 
+    private String phone;
+
+    private String idCard;
+
     @Schema(title = "鍐滄埛缂栧彿")
     private String clientNum;
+
+    /**
+     * 姘村崱浣欓
+     */
+    private Float money;
 
     @Schema(title = "姘村崱缂栧彿")
     private String cardNum;
@@ -35,17 +44,22 @@
     @Schema(title = "鍏呭�奸噾棰�")
     private Float amount;
 
+    @Schema(title = "杩斿洖閲戦")
+    private Float refundAmount;
+
     @Schema(title = "鍏呭�煎悗閲戦")
     private Float afterRecharge;
 
     @Schema(title = "鏀粯鏂瑰紡")
-    private Integer paymentId;
+    private String paymentName;
 
     @Schema(title = "姘翠环")
     private Float price;
 
     @Schema(title = "鎿嶄綔浜�")
-    private String operator;
+    private String opr;
+
+    private String operateType;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

--
Gitblit v1.8.0