From e7110f57152cc0428dfa18ea34a924b06b2d89b3 Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期二, 09 四月 2024 14:12:53 +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 | 4 ++-- 1 files changed, 2 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..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 @@ -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,7 @@ private Integer state;// 鐘舵�� private Integer method;// 鍑虹墖鏂瑰紡 private Date starttime;// 浠诲姟棰嗗彇鏃堕棿 + public List<GlassInfo> glassinfo;// 鐜荤拑淇℃伅 -- Gitblit v1.8.0