From 83ef8b0e6fc20d4528bf54468f7fe4c1fdef86b1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 八月 2024 11:36:56 +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/VoActiveCard.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java
index cad9d4a..f33c3e6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.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;
@@ -27,10 +29,10 @@
     private String clientName;
 
     @Schema(title = "鍐滄埛缂栧彿")
-    private Long clientId;
+    private String clientNum;
 
-    @Schema(title = "姘村崱鍦板潃")
-    private String cardAddr;
+    @Schema(title = "姘村崱缂栧彿")
+    private String cardNum;
 
     @Schema(title = "姘村崱鐘舵��")
     private Byte state;
@@ -45,7 +47,8 @@
     private Double reissueAmount;
 
     @Schema(title = "鏀粯鏂瑰紡")
-    private Integer paymentId;
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long paymentId;
 
     @Schema(title = "鎿嶄綔浜�")
     private String operator;

--
Gitblit v1.8.0