From 1734f2d56162a1fdb556632dc36fcef0ca57851c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 16 十二月 2024 11:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/model/TModel.java | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/model/TModel.java b/manage/src/main/java/com/jilongda/manage/model/TModel.java
index 7bbe1ab..78f3c1c 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TModel.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TModel.java
@@ -7,6 +7,8 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.jilongda.common.pojo.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +26,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_model")
@ApiModel(value="TModel对象", description="镜架型号表")
-public class TModel implements Serializable {
+public class TModel extends BaseModel {
private static final long serialVersionUID = 1L;
@@ -63,24 +65,7 @@
@ApiModelProperty(value = "状态 1启用 2禁用")
@TableField("status")
private Integer status;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("createTime")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "修改时间")
- @TableField("updateTime")
- private LocalDateTime updateTime;
-
- @TableField("createBy")
- private String createBy;
-
- @TableField("updateBy")
- private String updateBy;
-
- @ApiModelProperty(value = "是否删除 0否1是")
- @TableField("isDelete")
- private Integer isDelete;
-
-
+ @ApiModelProperty(value = "库存")
+ @TableField("inventory")
+ private Integer inventory;
}
--
Gitblit v1.7.1