From 794b6e8d50cc501b99e21e0f67b32e0399664cb0 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期一, 11 八月 2025 17:25:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'huliguo/master' --- guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TaskRecordInfo.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TaskRecordInfo.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TaskRecordInfo.java index 66a6a45..bd1a23a 100644 --- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TaskRecordInfo.java +++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/TaskRecordInfo.java @@ -23,7 +23,7 @@ private Integer type; @ApiModelProperty("任务名称") private String name; - @ApiModelProperty("任务状态(1=待执行,2=进行中,3=成功,4=失败)") + @ApiModelProperty("执行状态(1=待执行,2=执行中,3=成功,4=离线,5=失败)") private Integer status; @ApiModelProperty("执行时间") private String executionTime; @@ -33,4 +33,6 @@ private Long normalNum; @ApiModelProperty("异常数量") private Long abnormalNum; + @ApiModelProperty("进行中") + private Long underway; } -- Gitblit v1.7.1