From 4ca7bd3844958b23c47864388b644fe9b76e69ef Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 21 九月 2024 10:52:25 +0800
Subject: [PATCH] 2024-09-21 朱宝民 获取充值记录接口,返回值增加居委会名称

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 2638fb8..57b15a9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -22,7 +22,7 @@
  */
 
 @Data
-@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cardState", "districtTitle", "villageId"})
+@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cashierName", "cardState", "districtTitle", "villageId"})
 @HeadRowHeight(30)
 @ContentRowHeight(20)
 public class VoTradeDetails implements BaseEntity {
@@ -113,9 +113,8 @@
     /**
      * 浣欓
      */
-    @JSONField(serializeUsing= ObjectWriterImplToString.class)
     @ColumnWidth(15)
-    private Long money;
+    private Double money;
 
     /**
      * 浠樻鏂瑰紡
@@ -140,6 +139,12 @@
     private Long cashierId;
 
     /**
+     * 鏀堕摱鍛樺鍚�
+     */
+    @ColumnWidth(15)
+    private String cashierName;
+
+    /**
      * 鍗$墖鐘舵��
      */
     @ColumnWidth(15)

--
Gitblit v1.8.0