From 5c2e8a80d739c5659d74bfd2cbe232b5d72ce21f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 15 十月 2024 16:47:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
index 8c6a3be..5346dee 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
@@ -2,20 +2,23 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wf
  * @since 2024-09-10
  */
 @Data
+@Builder
 @EqualsAndHashCode(callSuper = false)
 public class RawGlassStorageTask implements Serializable {
 
@@ -38,7 +41,7 @@
     /**
      * 鍘熺墖鏁伴噺
      */
-    private String patternQuantity;
+    private Integer patternQuantity;
 
     /**
      * 浠诲姟绫诲瀷
@@ -53,7 +56,7 @@
     /**
      * 鍒涘缓鏃堕棿
      */
-    private String createTime;
+    private Date createTime;
 
 
 }

--
Gitblit v1.8.0