From 95dc030ad8e77303207a1a42a3afd9a7a6612d75 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 03 Jun 2025 18:43:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/message/domain/MessageSystem.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageSystem.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageSystem.java
index 78b5cda..9b9c06f 100644
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageSystem.java
+++ b/oying-system/src/main/java/com/oying/modules/message/domain/MessageSystem.java
@@ -5,31 +5,36 @@
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import java.sql.Timestamp;
+import javax.rmi.CORBA.Tie;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.util.Date;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
/**
-* @description /
-* @author 李萌
-* @date 2025-05-14
-**/
+ * @description /
+ * @author 李萌
+ * @date 2025-05-20
+ **/
@Data
@TableName("message_system")
public class MessageSystem implements Serializable {
- @TableId(value = "system_message_id", type = IdType.AUTO)
- @ApiModelProperty(value = "主键，自增")
- private Long systemMessageId;
+ //使用数据库的自增策略来生成id
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "id")
+ private Integer id;
@NotNull
- @ApiModelProperty(value = "外键，关联 `message_info` 表")
- private Long messageId;
+ @ApiModelProperty(value = "系统维护开始时间")
+ private Timestamp startTime;
- @ApiModelProperty(value = "系统维护时间")
- private Timestamp maintenanceTime;
+ @NotNull
+ @ApiModelProperty(value = "系统维护截至时间")
+ private Timestamp endTime;
public void copy(MessageSystem source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
--
Gitblit v1.9.3