Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-17 b6fa74e9efd2d109ad8891337e7c59c9b6c62cc6

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/base/entity/HollowBigStorageCageBaseInfo.java

@@ -45,6 +45,12 @@
    private double height;

    /**
     * 厚度
     */
    @ApiModelProperty(value = "厚度")
    private Double thickness;

    /**
     * 格子号
     */
    @ApiModelProperty(value = "玻璃id")
@@ -58,7 +64,11 @@
    /**
     * 格子号
     */
    @ApiModelProperty(value = "玻璃id")

    @ApiModelProperty(value = "是否配对")
    private Integer isPair;
    /**
     * /*中空顺序
     */
    @ApiModelProperty(value = "中空顺序")
    private Integer hollowSequence;
}