Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

2024-11-27 4fe39e9df868a8fdd40549f169adbea2e8bd622a

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java

@@ -1,11 +1,8 @@
package com.dy.pipIrrStatistics.intake.qo;

import com.dy.common.webUtil.QueryConditionVo;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.time.LocalDate;

/**
 * @author ZhuBaoMin
@@ -21,8 +18,7 @@
    /**
     * 统计年月
     */
    @NotNull(message = "统计年月不能为空")
    private LocalDate yearMonth;
    private String yearMonth;

    /**
     * 年