From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 000519d..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,5 +1,7 @@
package com.mes.edgglasstask.entity;
+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;
@@ -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,29 +55,29 @@
@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 Date time;
+ @ApiModelProperty(value = "寮�濮嬫椂闂�", position = 8)
+ private Date createTime;
+ /**
+ * 绾胯矾
+ */
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", position = 9)
+ private Date updateTime;
@TableLogic
private int deleted;
--
Gitblit v1.8.0