From f22ad73994e08da7e1f87dad7b7dec8b348a695b Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期日, 28 九月 2025 17:13:54 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching --- ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionOperation.java | 30 ++++-------------------------- 1 files changed, 4 insertions(+), 26 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionOperation.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionOperation.java index fdf2ae6..6f0184d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionOperation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TMissionOperation.java @@ -1,15 +1,15 @@ package com.ruoyi.system.model; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.core.domain.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.time.LocalDateTime; /** @@ -24,11 +24,11 @@ @EqualsAndHashCode(callSuper = false) @TableName("t_mission_operation") @ApiModel(value="TMissionOperation对象", description="任务操作记录") -public class TMissionOperation implements Serializable { +public class TMissionOperation extends BaseModel { private static final long serialVersionUID = 1L; - @TableId("id") + @TableId(value = "id", type = IdType.ASSIGN_ID) private String id; @ApiModelProperty(value = "任务id") @@ -50,27 +50,5 @@ @ApiModelProperty(value = "操作时间") @TableField("operation_time") private LocalDateTime operationTime; - - @ApiModelProperty(value = "创建时间") - @TableField("create_time") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改时间") - @TableField("update_time") - private LocalDateTime updateTime; - - @ApiModelProperty(value = "创建人") - @TableField("create_by") - private String createBy; - - @ApiModelProperty(value = "修改人") - @TableField("update_by") - private String updateBy; - - @ApiModelProperty(value = "是否删除 0=否 1=是") - @TableField("disabled") - @TableLogic - private Integer disabled; - } -- Gitblit v1.7.1