From 73a0ffbc8f1c5c625ce4bb3225c0e5e30179520e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 17:42:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/domain/MwBox.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwBox.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwBox.java
index eb8fc4c..5b98b38 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/MwBox.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/MwBox.java
@@ -1,15 +1,17 @@
package com.sinata.system.domain;
+import com.baomidou.mybatisplus.annotation.FieldFill;
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.sinata.common.entity.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -24,7 +26,7 @@
@Setter
@TableName("MW_BOX")
@ApiModel(value = "MwBox对象", description = "转运箱")
-public class MwBox extends BaseModel {
+public class MwBox implements Serializable {
private static final long serialVersionUID = 1L;
@@ -36,7 +38,7 @@
@TableField("BOX_NUMBER")
private String boxNumber;
- @ApiModelProperty("转运箱状态 1：正常 2：丢失 3：破坏 4：正常")
+ @ApiModelProperty("转运箱状态 1：正常 2：丢失 3：破坏")
@TableField("STATUS")
private Integer status;
@@ -52,5 +54,39 @@
@TableField("LINK")
private Integer link;
+ /**
+ * 创建者
+ */
+ @ApiModelProperty(value = "记录创建人，前端忽略")
+ @TableField(value = "create_by", fill = FieldFill.INSERT)
+ private Long createBy;
+ /**
+ * 创建时间
+ */
+ @ApiModelProperty(value = "记录创建时间，前端忽略")
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
+ private Date createTime;
+
+ /**
+ * 更新者
+ */
+ @ApiModelProperty(value = "记录修改人，前端忽略")
+ @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
+ private Long updateBy;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "记录修改时间，前端忽略")
+ @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
+
+ /**
+ * 是否删除 0未删除 1已删除
+ */
+ @TableField("del_flag")
+ @ApiModelProperty(value = "是否删除 0未删除 1已删除")
+ @TableLogic(value = "0", delval = "NULL")
+ private Integer delFlag;
}
--
Gitblit v1.7.1