From cc956d4366d31f0cdd97dcb851a880cbd7660d0f Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 03 八月 2024 11:03:16 +0800
Subject: [PATCH] 2024-08-03 朱宝民 获取电池电压低于指定值的取水口

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java |   42 ++++++++++++++++++++++++++++++++++--------
 1 files changed, 34 insertions(+), 8 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 1994e6a..1434dd0 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
@@ -1,5 +1,7 @@
 package com.dy.pipIrrGlobal.voSe;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
 import com.dy.common.po.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,32 +22,56 @@
 public class VoRecharge implements BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    @Schema(title = "ID")
-    private Long id;
+    //@Schema(title = "ID")
+    //private String id;
+
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long opeId;
+
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long cardId;
 
     @Schema(title = "鍐滄埛濮撳悕")
     private String clientName;
 
-    @Schema(title = "鍐滄埛缂栧彿")
-    private Long clientId;
+    private String phone;
 
-    @Schema(title = "姘村崱鍦板潃")
-    private String cardAddr;
+    private String idCard;
+
+    @Schema(title = "鍐滄埛缂栧彿")
+    private String clientNum;
+
+    private String address;
+
+    /**
+     * 姘村崱浣欓
+     */
+    private Float money;
+
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long cardNum;
+
+    private Integer cardCost;
 
     @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