From 52516230c75988540b51e7160b1f5c03b96583ea Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期四, 05 九月 2024 16:09:40 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java index 5c89cc9..5a79a88 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java @@ -29,8 +29,8 @@ /** * 澶х悊鐗囩琛╥d */ - @ApiModelProperty(value = "澶х悊鐗囩琛╥d", position = 2) - @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "澶х悊鐗囩琛╥d", position = 2) + @TableId(value = "id", type = IdType.AUTO) private Integer id; /** @@ -46,15 +46,26 @@ private Integer slot; /** + * 鏍呮牸鍙� + */ + @ApiModelProperty(value = "鏈�灏忓帤搴�", position = 5) + private Integer minThickness; + /** + * 鏍呮牸鍙� + */ + @ApiModelProperty(value = "鏈�澶у帤搴�", position = 6) + private Integer maxThickness; + + /** * 鍚敤鐘舵�� */ - @ApiModelProperty(value = "鍚敤鐘舵��", position = 5) - private String enableState; + @ApiModelProperty(value = "鍚敤鐘舵��", position = 7) + private Integer enableState; /** * 鍓╀綑瀹藉害 */ - @ApiModelProperty(value = "鍓╀綑瀹藉害", position = 6) + @ApiModelProperty(value = "鍓╀綑瀹藉害", position = 8) private Integer remainWidth; @ApiModelProperty(hidden = true) -- Gitblit v1.8.0