From 075daef140ea17638529e09ef95b7cb28ed66ae5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 22 一月 2026 13:48:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/OnDuty.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OnDuty.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OnDuty.java
index 209db79..27797e6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OnDuty.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OnDuty.java
@@ -1,11 +1,9 @@
package com.ruoyi.system.model;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -75,5 +73,12 @@
@TableField("create_time")
private LocalDateTime createTime;
+ @TableField("creator_id")
+ private Integer creatorId;
+
+ @TableField("deleted")
+ @TableLogic
+ private Boolean deleted;
+
}
--
Gitblit v1.7.1