From baff68fa55ed3212f618330e18cc5735b1caf57f Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 12 十月 2024 10:06:37 +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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..7e16be5 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;
@@ -21,16 +23,17 @@
private static final long serialVersionUID = 1L;
@Schema(title = "ID")
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long id;
@Schema(title = "鍐滄埛濮撳悕")
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;
@@ -44,8 +47,13 @@
@Schema(title = "琛ュ崱閲戦")
private Double reissueAmount;
- @Schema(title = "鏀粯鏂瑰紡")
- private Integer paymentId;
+ //@Schema(title = "鏀粯鏂瑰紡")
+ //@JSONField(serializeUsing= ObjectWriterImplToString.class)
+ //private Long paymentId;
+ /**
+ * 鏀粯鏂瑰紡鍚嶇О
+ */
+ private String paymentName;
@Schema(title = "鎿嶄綔浜�")
private String operator;
--
Gitblit v1.8.0