From b9e0f06eb30c3b77171cd78b9311758d17400d5b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 06 七月 2024 10:39:31 +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/pojoRm/RmIntakeAmountHistory.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java
index c2ec2de..e9ef13e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountHistory.java
@@ -43,6 +43,13 @@
public Long intakeid;
/**
+ * 缁熻鏃ユ湡
+ */
+ @Schema(description = "鏃ユ湡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ public Date dt;
+
+ /**
* 绱鍙栨按閲忥紙涓嶅寘鎷紡鎹熸按閲忥級
*/
@Schema(description = "绱鍙栨按閲忥紙涓嶅寘鎷紡鎹熸按閲忥級", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -55,6 +62,12 @@
public Double loss;
/**
+ * 鏈�鍚庤姘撮噺鐨勬帶鍒跺櫒鍦板潃
+ */
+ @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
+ public String rtuAddrLast;
+
+ /**
* 鏈�鍚庤姘撮噺鐨勬帶鍒跺櫒ID锛堝閿級
*/
@Schema(description = "鎺у埗鍣ㄥ疄浣撳閿�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -62,9 +75,9 @@
public Long controlleridlast;
/**
- * 鏈�鍚庤姘撮噺鏃ユ湡
+ * 鏈�鍚庤姘撮噺涓婃姤鏁版嵁鎺ユ敹鏃堕棿
*/
- @Schema(description = "鏈�鍚庤姘撮噺鏃ユ湡", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鏁版嵁鎺ユ敹鏃堕棿", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date dtlast;
--
Gitblit v1.8.0