From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。

---
 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java
index 3c56028..da40a5a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java
@@ -2,18 +2,25 @@
 
 import com.dy.common.webUtil.QueryConditionVo;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author ZhuBaoMin
  * @date 2024-08-08 9:59
  * @LastEditTime 2024-08-08 9:59
- * @Description
+ * @Description 鍙栨按鍙g敤姘存煡璇㈠璞°�佹紡绠楁煡璇㈠璞�
  */
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class IntakeAmountQO extends QueryConditionVo {
 
     /**
+     * 缁熻骞存湀
+     */
+    private String yearMonth;
+
+    /**
      * 骞�
      */
     private Integer year;

--
Gitblit v1.8.0