From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java
index ba1a018..6798cbb 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java
@@ -1,14 +1,16 @@
package com.mes.edgstoragecage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
@@ -23,8 +25,13 @@
/**
* 纾ㄨ竟鍓嶇悊鐗囩璇︽儏琛╥d
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ /**
+ * 宸ョ▼id
+ */
+ private String engineerId;
/**
* 璁惧id
@@ -39,7 +46,7 @@
/**
* 鐜荤拑id
*/
- private Integer glassId;
+ private String glassId;
/**
* 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
@@ -59,27 +66,32 @@
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
/**
* 鍘氬害
*/
- private Double thickness;
+ private double thickness;
+
+ /**
+ * 鑶滅郴
+ */
+ private String filmsid;
/**
* 纾ㄥ墠瀹�
*/
- private Double edgWidth;
+ private double edgWidth;
/**
* 纾ㄥ墠楂�
*/
- private Double edgHeight;
+ private double edgHeight;
/**
* 閽㈠寲鐗堝浘id
@@ -97,7 +109,7 @@
private Integer patternSequence;
/**
- * 鐘舵��
+ * 鐘舵�� 锛堣瘑鍒悗鎴愬姛鐘舵��100锛屽嚭鐗囦换鍔�101锛� 鎷胯蛋200锛岀牬鎹�201锛�
*/
private Integer state;
@@ -105,6 +117,11 @@
* 鐜荤拑闂撮殭
*/
private Integer gap;
+ /**
+ * 鐜荤拑闂撮殭
+ */
+ @TableField(exist = false)
+ private Integer count;
}
--
Gitblit v1.8.0