From 1a3b168ee80469454dc04a1c42784d1b4005b07c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 09 九月 2024 14:22:37 +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/client/qo/CommonQO.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/qo/CommonQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/qo/CommonQO.java
index 86a1623..8eee570 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/qo/CommonQO.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/client/qo/CommonQO.java
@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author ZhuBaoMin
@@ -13,6 +14,7 @@
  */
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class CommonQO extends QueryConditionVo {
 
     /**
@@ -25,6 +27,6 @@
      * 缁撴潫鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
+//    @NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
     private String timeStop;
 }

--
Gitblit v1.8.0