From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java
index acd8f83..9226203 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java
@@ -1,15 +1,43 @@
 package com.mes.taskcache.entity;
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-@Data  //lombok 绠�鍐檍ava浠g爜 瀹炰綋绫荤殑get涓巗et
+import java.util.Date;
+
+/**
+ * 鍗у紡鐞嗙墖绗间换鍔¤〃
+ */
+@Data
 @TableName("task_cache")
 public class TaskCache {
-    private String ID;//浠诲姟缂栧彿
-    private String startcell;//璧峰
-    private String endcell;//缁撴潫
-    private String tasktype;//浠诲姟绫诲瀷
-    private String taskstauts;//浠诲姟鐘舵��
+    /**
+     * 浠诲姟缂栧彿
+     */
+    private String glassId;
+    /**
+     * 璧峰
+     */
+    private int startCell;
+    /**
+     * 缁撴潫
+     */
+    private int endCell;
+    /**
+     * 浠诲姟绫诲瀷
+     */
+    private int taskType;
+    /**
+     * 浠诲姟鐘舵��
+     */
+    private int taskStatus;
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    private Date createTime;
+
+    @TableLogic
+    private int deleted;
 
 }

--
Gitblit v1.8.0