From eaa749c5939632dd1aa7aa9440570886e29e6a63 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 26 三月 2024 15:32:42 +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 | 50 +++++++++++++++++++-------------------------------
1 files changed, 19 insertions(+), 31 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 f90a3bc..5e62d7f 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,43 +1,31 @@
package com.example.springboot.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import java.sql.Date;
+import java.util.List;
+
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-/**
- * 娴佺▼鍗¤〃
- */
@Data
-@TableName("flowcard")
+@TableName("`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;// 浠诲姟棰嗗彇鏃堕棿
+
- /**
- * 涓婚敭锛岃嚜鍔ㄧ敓鎴�
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ public List<GlassInfo> glassinfo;// 鐜荤拑淇℃伅
- /**
- * 娴佺▼鍗�
- */
- private String flowcard;
- /**
- * 鎬诲眰鏁�
- */
- private Integer totaltier;
- /**
- * 鐜荤拑鏁伴噺
- */
- private Integer number;
- /**
- * 浠诲姟绾胯矾
- */
- private Integer line;
- /**
- * 鐘舵��
- */
- private Integer state;
+ public void setglassinfo(List<GlassInfo> glassinfo) {
+ this.glassinfo = glassinfo;
+ }
+ public List<GlassInfo> getglassinfo() {
+ return glassinfo;
+ }
}
--
Gitblit v1.8.0