From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 12 七月 2025 14:42:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/IndexVO.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/IndexVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/IndexVO.java index 5a7857f..0b9f9cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/IndexVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/IndexVO.java @@ -19,12 +19,16 @@ private BigDecimal middle; @ApiModelProperty(value = "数据预览-合格率") private BigDecimal rate; + @ApiModelProperty(value = "是否请假 0否1是") + private Integer isLeave; + @ApiModelProperty(value = "是否有消息通知 0否1是") + private Integer isNotice; @ApiModelProperty(value = "审批列表") private List<LeaveUserListVO> leaveList; - @ApiModelProperty(value = "待整改任务") - private List<TaskTodayVO> pendingTask; - @ApiModelProperty(value = "今日任务") + @ApiModelProperty(value = "待整改任务列表") + private List<TaskPendingVO> pendingTask; + @ApiModelProperty(value = "今日任务列表") private List<TaskTodayVO> todayTask; - @ApiModelProperty(value = "明日任务预览") - private List<TaskTodayVO> tomorrowTask; + @ApiModelProperty(value = "明日任务预览列表") + private List<TaskTomorrowVO> tomorrowTask; } -- Gitblit v1.7.1