From 595b66ae8800511fab34e503f94d173613088c08 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 01 三月 2025 09:57:38 +0800
Subject: [PATCH] 1、表阀一体机新协议开阀报关阀报数据处理逻辑修改; 2、农户月用水统计查询中,缺少农户姓名,进行SQL修改。

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVirtualCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVirtualCard.java
index 43f3e22..f2af26f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVirtualCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVirtualCard.java
@@ -3,6 +3,8 @@
 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 com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
 
 /**
@@ -13,6 +15,7 @@
  */
 
 @Data
+@JsonPropertyOrder({ "id", "vcNum", "money", "inUse", "isAlarmValue"})
 public class VoVirtualCard implements BaseEntity {
     private static final long serialVersionUID = 202405240815001L;
 
@@ -22,10 +25,11 @@
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
     private Long vcNum;
 
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double money;
 
-    private Byte inUse;
+    private Boolean inUse;
 
-    private String inUseName;
+    private Boolean isAlarmValue;
 
 }

--
Gitblit v1.8.0