From ecb4007518d3b3fb658dcd3fdcf3d87083874bdf Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期二, 23 四月 2024 19:11:33 +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 |    4 +++-
 1 files changed, 3 insertions(+), 1 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..9af1d08 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,7 +122,7 @@
     /**
      * 宸ョ▼鍙�
      */
-    private Integer engineerId;
+    private String engineerId;
 
     /**
      * 鐢熶骇瑙勫垯id

--
Gitblit v1.8.0