From c407e091ff0320625ef2566a4bea362c697200c9 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 六月 2024 22:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
index 9c8a82c..1f275f1 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
@@ -1,5 +1,6 @@
 package com.mes.downglassinfo.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,7 +25,7 @@
     /**
      * id
      */
-    @TableId(value = "id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -36,12 +37,12 @@
     /**
      * 璧峰
      */
-    private String startCell;
+    private Integer startCell;
 
     /**
      * 鐩爣
      */
-    private String endCell;
+    private Integer endCell;
 
     /**
      * 浠诲姟绫诲瀷 1:杩�   2锛氬嚭
@@ -51,12 +52,12 @@
     /**
      * 瀹�
      */
-    private Double width;
+    private Integer width;
 
     /**
      * 楂�
      */
-    private Double height;
+    private Integer height;
 
     /**
      * 鑶滅郴
@@ -66,7 +67,7 @@
     /**
      * 鍘氬害
      */
-    private Double thickness;
+    private Integer thickness;
 
     /**
      * 娴佺▼鍗″彿

--
Gitblit v1.8.0