From 39c3762e13e83492ae98d3ef20f88f85f208bc95 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 24 十月 2024 11:48:11 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 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 f854097..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
@@ -1,10 +1,8 @@
 package com.dy.pipIrrStatistics.intake.qo;
 
 import com.dy.common.webUtil.QueryConditionVo;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-
-import java.time.LocalDate;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author ZhuBaoMin
@@ -14,13 +12,13 @@
  */
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class IntakeAmountQO extends QueryConditionVo {
 
     /**
      * 缁熻骞存湀
      */
-    @NotNull(message = "缁熻骞存湀涓嶈兘涓虹┖")
-    private LocalDate yearMonth;
+    private String yearMonth;
 
     /**
      * 骞�

--
Gitblit v1.8.0