From 70f2265af5c8ec078ef2a7be65dd7229ab5f2924 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 六月 2024 10:49:08 +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 | 6 ++++--
1 files changed, 4 insertions(+), 2 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 525d3e4..442e8bd 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
@@ -5,12 +5,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
-import cn.hutool.core.date.DateTime;
import lombok.Data;
@Data
@TableName("`flowcard`")
-public class Flowcard {
+public class FlowCard {
private Integer id;// 鑷id
private String flowcard;// 娴佺▼鍗d
private Integer number;// 鐜荤拑鏁伴噺
@@ -18,6 +17,9 @@
private Integer state;// 鐘舵��
private Integer method;// 鍑虹墖鏂瑰紡
private Date starttime;// 浠诲姟棰嗗彇鏃堕棿
+ private Integer orderstate;// 浠诲姟棰嗗彇鏃堕棿
+
+
public List<GlassInfo> glassinfo;// 鐜荤拑淇℃伅
--
Gitblit v1.8.0