From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 16:09:11 +0800
Subject: [PATCH] 1、更新日漏损最新记录有bug(新生成了记录,应该是更新老记录),修改之 ; 2、CommonV1_0_0中获取开关阀类型名称时,对于null返回空字符串。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoActiveCard.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 f33c3e6..677dc81 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
@@ -23,6 +23,7 @@
     private static final long serialVersionUID = 1L;
 
     @Schema(title = "ID")
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
     private Long id;
 
     @Schema(title = "鍐滄埛濮撳悕")
@@ -44,11 +45,16 @@
     private Integer cardCost;
 
     @Schema(title = "琛ュ崱閲戦")
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double reissueAmount;
 
-    @Schema(title = "鏀粯鏂瑰紡")
-    @JSONField(serializeUsing= ObjectWriterImplToString.class)
-    private Long paymentId;
+    //@Schema(title = "鏀粯鏂瑰紡")
+    //@JSONField(serializeUsing= ObjectWriterImplToString.class)
+    //private Long paymentId;
+    /**
+     * 鏀粯鏂瑰紡鍚嶇О
+     */
+    private String paymentName;
 
     @Schema(title = "鎿嶄綔浜�")
     private String operator;

--
Gitblit v1.8.0