From 354cc1c2c7ff69c1183d77f1761a71d1ad5669da Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 30 九月 2025 10:46:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionUser.java | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionUser.java index fa63aa2..14d4ae5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionUser.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionUser.java @@ -11,6 +11,7 @@ import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Date; /** * <p> @@ -46,4 +47,37 @@ @TableField("user_type") private Integer userType; + @ApiModelProperty(value = "任务状态 0待完成 1已完成 2未完成") + private Integer status; + + + @ApiModelProperty(value = "任务完成时间") + @TableField("success_time") + private Date successTime; + + + + @ApiModelProperty(value = "战损备注") + @TableField("loss_remark") + private String lossRemark; + @ApiModelProperty(value = "战果备注") + @TableField("victory_remark") + private String victoryRemark; + @ApiModelProperty(value = "战损json详情") + @TableField("loss_text") + private String lossText; + @ApiModelProperty(value = "战果json详情") + @TableField("victory_text") + private String victoryText; + @ApiModelProperty(value = "任务结果") + private String result; + @ApiModelProperty(value = "任务结果图片") + @TableField("result_img") + private String resultImg; + @ApiModelProperty(value = "任务结果视频") + @TableField("result_video") + private String resultVideo; + @ApiModelProperty(value = "任务结果音频") + @TableField("result_voice") + private String resultVoice; } -- Gitblit v1.7.1