From 889ff0512bc68be0f5d231a524bf97c9488ec37f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 16 五月 2024 16:13:20 +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 | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 6ab4929..56172d8 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;
@@ -9,7 +10,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
@@ -24,13 +25,14 @@
/**
* 鐜荤拑淇℃伅琛╥d
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 娴佺▼鍗�
*/
- private String flowcardId;
+ @TableField("flow_card_Id")
+ private String flowCardId;
/**
* 娴佺▼鍗＄幓鐠冪被鍨�
@@ -55,7 +57,7 @@
/**
* 鑶滅郴
*/
- private Integer filmsid;
+ private String filmsid;
/**
* 纾ㄥ墠瀹�
@@ -120,12 +122,14 @@
/**
* 宸ョ▼鍙�
*/
- private Integer engineerId;
+ private String engineerId;
/**
* 鐢熶骇瑙勫垯id
*/
private Integer ruleId;
-
-
+ /**
+ * 鐜荤拑id
+ */
+ private String glassId;
}
--
Gitblit v1.8.0