From 26f6f43785afd992496d7fc79775124e557ff16d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 21 十月 2025 17:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java
index 9c02b4f..0a97581 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java
@@ -64,7 +64,7 @@
     @TableField("mission_electronic")
     private String missionElectronic;
 
-    @ApiModelProperty(value = "状态 1=待指派 2=待完成 3=待评分 4=已完成 5=待改派")
+    @ApiModelProperty(value = "状态 1=待指派 2=待完成 3=待评分 4=已完成 5=待改派 6=未完成")
     @TableField("status")
     private Integer status;
 
@@ -127,5 +127,36 @@
     @TableField("is_mission_pool")
     private Integer isMissionPool;
 
+    @ApiModelProperty(value = "响应时长")
+    @TableField("res_time")
+    private Double resTime;
+
+    @ApiModelProperty(value = "完成时长")
+    @TableField("success_time")
+    private Double successTime;
+
+
+    @ApiModelProperty(value = "用户任务id")
+    @TableField(exist = false)
+    private String userMissionId;
+
+
+
+    @ApiModelProperty(value = "任务类型")
+    @TableField(exist = false)
+    private String missionType;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "任务结果 1已完成  2未完成")
+    private Integer missionStatus;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "任务评分 ")
+    private Double score;
+
+    @TableField(exist = false)
+    private TMissionUser missionUser;
 
 }

--
Gitblit v1.7.1