From cf33278c73767f72e35a4898c23765f52a3bfd1d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 十二月 2024 09:06:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywMes'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java
index f6e8f1c..b1d148d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java
@@ -1,13 +1,15 @@
package com.mes.edgglasstask.entity;
-import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -22,11 +24,13 @@
@EqualsAndHashCode(callSuper = false)
public class EdgGlassTaskInfo implements Serializable {
+ private static final long serialVersionUID = 1L;
+
/**
* 纾ㄨ竟浠诲姟id
*/
- private static final long serialVersionUID = 1L;
-
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
/**
* 鐜荤拑id
*/
@@ -51,28 +55,31 @@
@ApiModelProperty(value = "鍘氬害", position = 5)
private Integer thickness;
- /**
- * 鐜荤拑绫诲瀷
- */
- @ApiModelProperty(value = "鐜荤拑绫诲瀷", position = 6)
- private Integer glassType;
/**
* 鐘舵��
*/
- @ApiModelProperty(value = "鐘舵��", position = 7)
- private Integer status;
+ @ApiModelProperty(value = "鐘舵��", position = 6)
+ private Integer state;
/**
* 绾胯矾
*/
- @ApiModelProperty(value = "绾胯矾", position = 8)
+ @ApiModelProperty(value = "绾胯矾", position = 7)
private Integer line;
/**
* 绾胯矾
*/
- @ApiModelProperty(value = "鏃堕棿", position = 9)
- private DateTime time;
+ @ApiModelProperty(value = "寮�濮嬫椂闂�", position = 8)
+ private Date createTime;
+ /**
+ * 绾胯矾
+ */
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", position = 9)
+ private Date updateTime;
+
+ @TableLogic
+ private int deleted;
}
--
Gitblit v1.8.0