From 8665daa7aa863f96d0d8f27c167edae1efc38022 Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期五, 31 七月 2026 14:46:19 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/SysDashboardOverviewRequest.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/SysDashboardOverviewRequest.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/SysDashboardOverviewRequest.java
index e0b4b78..6fcccdd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/SysDashboardOverviewRequest.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/SysDashboardOverviewRequest.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,19 +13,20 @@
* @author ruoyi
*/
@Data
+@ApiModel(value = "SysDashboardOverviewRequest", description = "首页数据总览查询请求")
public class SysDashboardOverviewRequest
{
/** 统计周期：TODAY今日 RECENT_7_DAYS最近7天 RECENT_30_DAYS最近30天 */
- @ApiModelProperty("统计周期：TODAY今日 RECENT_7_DAYS最近7天 RECENT_30_DAYS最近30天")
+ @ApiModelProperty(value = "统计周期：TODAY今日，RECENT_7_DAYS最近7天，RECENT_30_DAYS最近30天；为空默认最近7天", example = "RECENT_7_DAYS")
private String periodType;
/** 自定义开始时间 */
- @ApiModelProperty("自定义开始时间")
+ @ApiModelProperty(value = "自定义开始时间；beginTime 与 endTime 同时传入且 endTime 晚于 beginTime 时生效", example = "2025-06-01 00:00:00")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginTime;
/** 自定义结束时间 */
- @ApiModelProperty("自定义结束时间")
+ @ApiModelProperty(value = "自定义结束时间；统计区间为左闭右开，即包含 beginTime，不包含 endTime", example = "2025-07-01 00:00:00")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
}
--
Gitblit v1.7.1