From 671db291656c3927ef58bbbdfb245746c63cec3e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 21 六月 2025 09:34:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java index 9f795a6..048ec3a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTask.java @@ -1,5 +1,6 @@ package com.ruoyi.system.model; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseModel; @@ -34,6 +35,7 @@ @TableField("project_id") private String projectId; + @Excel(name = "任务状态", width = 20,orderNum = "8",replace = {"1_未执行","2_超时","3_待确认","4_待整改","5_整改完成","6_已完成"}) @ApiModelProperty(value = "任务状态:1未执行、2超时、3待确认、4待整改、5整改完成、6已完成") @TableField("status") private Integer status; -- Gitblit v1.7.1