From e76f203f76b934d2f49dcea89649b2f616878056 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 18 三月 2024 12:36:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes

---
 springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java b/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
index 0d6a010..fbb9979 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/FlowCard.java
@@ -1,6 +1,7 @@
 package com.example.springboot.entity;
 
-import java.util.Date;
+import java.sql.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -8,12 +9,22 @@
 
 @Data
 @TableName("`flowcard`")
-public class flowcard {
+public class FlowCard {
   private Integer id;// 鑷id
   private String flowcard;// 娴佺▼鍗d
   private Integer number;// 鐜荤拑鏁伴噺
   private Integer line;// 浠诲姟璺嚎
   private Integer state;// 鐘舵��
- 
+  private Integer method;// 鍑虹墖鏂瑰紡
+  private Date starttime;// 浠诲姟棰嗗彇鏃堕棿
 
+  public List<GlassInfo> glassinfo;// 鐜荤拑淇℃伅
+
+  public void setglassinfo(List<GlassInfo> glassinfo) {
+    this.glassinfo = glassinfo;
+  }
+
+  public List<GlassInfo> getglassinfo() {
+    return glassinfo;
+  }
 }

--
Gitblit v1.8.0