From 37d2aec0dbe914c8924d6514da7eca053eee4cf3 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 26 三月 2025 17:26:35 +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/IntakeCountValueQO.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java index 0c46665..cd9351e 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeCountValueQO.java @@ -1,9 +1,8 @@ package com.dy.pipIrrStatistics.intake.qo; -import com.dy.common.webUtil.QueryConditionVo; -import com.fasterxml.jackson.annotation.JsonFormat; -import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author :WuZeYu @@ -12,12 +11,19 @@ * @Description */ @Data +@EqualsAndHashCode(callSuper = false) public class IntakeCountValueQO extends CommonQO { /** * 鍊� */ - @NotBlank(message = "鍊间笉鑳戒负绌�") - private int value; + @NotNull(message = "鍊间笉鑳戒负绌�") + public Integer value; + + + /////////////////////// + //闈炲墠绔彁浜ょ殑鍙傛暟 + public Long idStart ; + public Long idEnd ; } -- Gitblit v1.8.0