From 0b39edb68acc67ed01fbfe5d31bfa776a1b17de1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 25 三月 2026 09:14:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/show-demo' into show_demo

---
 jyz-base-start/src/main/java/com/tievd/jyz/entity/vo/DataStatisReqVo.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/jyz-base-start/src/main/java/com/tievd/jyz/entity/vo/DataStatisReqVo.java b/jyz-base-start/src/main/java/com/tievd/jyz/entity/vo/DataStatisReqVo.java
index 3e63897..edb793a 100644
--- a/jyz-base-start/src/main/java/com/tievd/jyz/entity/vo/DataStatisReqVo.java
+++ b/jyz-base-start/src/main/java/com/tievd/jyz/entity/vo/DataStatisReqVo.java
@@ -28,6 +28,18 @@
 
     @Schema(description = "缁撴潫鏃堕棿")
     private String endTime;
+
+    @Schema(description = "娲诲姩鍓嶅紑濮嬫椂闂�")
+    private String beforeStartTime;
+
+    @Schema(description = "娲诲姩鍓嶇粨鏉熸椂闂�")
+    private String beforeEndTime;
+
+    @Schema(description = "娲诲姩鍚庡紑濮嬫椂闂�")
+    private String afterStartTime;
+
+    @Schema(description = "娲诲姩鍚庣粨鏉熸椂闂�")
+    private String afterEndTime;
     
     public void setOrgCodeIfnull(String orgCode) {
         if (this.orgCode == null || this.orgCode.equals("")){
@@ -46,6 +58,12 @@
     
     @Schema(description = "HOURS, DAYS, MONTHS")
     private StatUnit timeUnit = StatUnit.HOURS;
+
+    @Schema(description = "瓒嬪娍鍥剧偣浣嶆椂闂�")
+    private String statTime;
+
+    @Schema(description = "瓒嬪娍鍥剧郴鍒楀悕绉�")
+    private String seriesName;
     
     private DataStatisReqVo setTimeUnit(String timeUnit){
         this.timeUnit = StatUnit.valueOf(timeUnit);

--
Gitblit v1.8.0