From 91e4ba507f9806c975a4273154d79f1a43b836c4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 29 四月 2024 13:42:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index dc023ed..46acc64 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -1,6 +1,7 @@
package com.mes.glassinfo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -30,6 +31,7 @@
/**
* 娴佺▼鍗�
*/
+ @TableField("flow_card_Id")
private String flowcardId;
/**
@@ -120,12 +122,14 @@
/**
* 宸ョ▼鍙�
*/
- private Integer engineerId;
+ private String engineerId;
/**
* 鐢熶骇瑙勫垯id
*/
private Integer ruleId;
-
-
+ /**
+ * 鐜荤拑id
+ */
+ private String glassId;
}
--
Gitblit v1.8.0