Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-22 10157d188a8c247fed7b5537283ca71c6cc32fea

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java

@@ -104,20 +104,8 @@
    private Integer state;

    /**
     * 格子
     */
    @ApiModelProperty(value = "格子", position = 17)
    private Integer slot;

    /**
     * 钢化类型
     */
    @ApiModelProperty(value = "钢化类型", position = 17)
    private Integer temperingType;

    /**
     * 工程id
     */
    @ApiModelProperty(value = "工程id", position = 17)
    private Integer engineerId;
    private String engineerId;
}