From fbd31387721424c65b173cbb23b03202f3e7dce6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 12 五月 2025 21:13:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java
index 635f475..3d5c70c 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/EdgGlassTaskInfo.java
@@ -53,28 +53,33 @@
@ApiModelProperty(value = "鍘氬害", position = 5)
private Integer thickness;
+ /**
+ * 鑶滅郴
+ */
+ @ApiModelProperty(value = "鑶滅郴", position = 6)
+ private String filmsid;
/**
* 鐘舵��
*/
- @ApiModelProperty(value = "鐘舵��", position = 6)
+ @ApiModelProperty(value = "鐘舵��", position = 7)
private Integer state;
/**
* 绾胯矾
*/
- @ApiModelProperty(value = "绾胯矾", position = 7)
+ @ApiModelProperty(value = "绾胯矾", position = 8)
private Integer line;
/**
* 绾胯矾
*/
- @ApiModelProperty(value = "寮�濮嬫椂闂�", position = 8)
+ @ApiModelProperty(value = "寮�濮嬫椂闂�", position = 9)
private Date createTime;
/**
* 绾胯矾
*/
- @ApiModelProperty(value = "鏇存柊鏃堕棿", position = 9)
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", position = 10)
private Date updateTime;
@TableLogic
--
Gitblit v1.8.0