From 9a332594f1efa890997f9ba8d3a4d964f1b68b72 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 30 六月 2025 08:57:39 +0800
Subject: [PATCH] 1、中间件设备日志文件针对FBox设备优化；2、表阀一体机功能码92返回结果判断bug修改；3、remote模块中实现表阀一体机协议的功能码9D(正常远程关阀)。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountDay.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountDay.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountDay.java
index a09de53..357870a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountDay.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmIntakeAmountDay.java
@@ -15,7 +15,7 @@
/**
* @Author: liurunyu
* @Date: 2024/7/8 18:53
- * @Description 鍙栨按鍙ｆ棩鍙栨按閲忔紡鎹熼噺
+ * @Description 鍙栨按鍙ｆ棩鍙栨按閲忔垨婕忔崯閲�
*/
@TableName(value="rm_intake_amount_day", autoResultMap = true)
@Data
@@ -23,7 +23,7 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "鍙栨按鍙ｆ棩鍙栨按閲忔紡鎹熼噺")
+@Schema(name = "鍙栨按鍙ｆ棩鍙栨按閲忔垨婕忔崯閲�")
public class RmIntakeAmountDay implements BaseEntity {
public static final long serialVersionUID = 2024007081854001L;
@@ -56,6 +56,17 @@
public Double amount;
/**
+ * 鏃ュ彇娑堣垂閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ public Double money;
+
+ /**
+ * 鏃ュ彇姘存鏁�
+ */
+ public Integer times;
+
+ /**
* 绱鏃ユ紡鎹熸按閲�
*/
@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
--
Gitblit v1.8.0