From 171439bcb3b5e4a636bbb81a93d61396f6e2940e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 17 二月 2025 17:32:09 +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/voAllRound/VoArIntakeRemote.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeRemote.java
similarity index 73%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeRemote.java
index a19d9be..d9d848e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voAllRound/VoArIntakeRemote.java
@@ -1,4 +1,4 @@
-package com.dy.pipIrrGlobal.VoAllRound;
+package com.dy.pipIrrGlobal.voAllRound;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
@@ -14,12 +14,12 @@
* @Description
*/
@Data
-@JsonPropertyOrder({"id", "onLine", "alarm", "alarmDt", "lastOpenDt", "lastCloseDt"})
+@JsonPropertyOrder({"intakeId", "onLine", "alarm", "alarmDt", "lastOpenDt", "lastCloseDt", "lossAmount", "lossDt"})
public class VoArIntakeRemote {
private static final long serialVersionUID = 202501141703001L;
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long id;
+ public Long intakeId;
/**
* 鍦ㄧ嚎鎯呭喌, true鍦ㄧ嚎锛宖alse绂荤嚎锛宯ull鏈煡
@@ -49,5 +49,17 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date lastCloseDt ;
+ /**
+ * 鏈�鍚庣粺璁℃紡鎹熼噺
+ */
+ public Double lossAmount ;
+
+ /**
+ * 鏈�鍚庣粺璁℃紡鎹熸棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ public Date lossDt ;
+
+
}
--
Gitblit v1.8.0