From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
index 635f2df..4c06b4b 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
@@ -60,17 +60,12 @@
@ApiModelProperty(value = "鐜荤拑绫诲瀷", position = 8)
private Integer glassType;
- /**
- * 楂�
- */
- @ApiModelProperty(value = "楂�", position = 10)
- private Double height;
/**
* 鍘氬害
*/
@ApiModelProperty(value = "鍘氬害", position = 11)
- private Double thickness;
+ private double thickness;
/**
* 閽㈠寲鐗堝浘id
@@ -99,20 +94,26 @@
/**
* 宸ョ▼鍙�
*/
- @ApiModelProperty(value = "宸ョ▼鍙�")
+ @ApiModelProperty(value = "宸ョ▼鍙�", position = 16)
private String engineerId;
+
+ /**
+ * 宸ョ▼鍙�
+ */
+ @ApiModelProperty(value = "灞�", position = 17)
+ private int layer;
/**
* 杩涚墖浠诲姟
*/
- @ApiModelProperty(value = "杩涚墖浠诲姟", position = 16)
+ @ApiModelProperty(value = "杩涚墖浠诲姟", position = 18)
@TableField(exist = false)
private BigStorageCageFeedTask bigStorageCageFeedTask;
/**
* 鍑虹墖浠诲姟
*/
- @ApiModelProperty(value = "鍑虹墖浠诲姟", position = 17)
+ @ApiModelProperty(value = "鍑虹墖浠诲姟", position = 19)
@TableField(exist = false)
private BigStorageCageOutTask bigStorageCageOutTask;
--
Gitblit v1.8.0