Merge remote-tracking branch 'origin/master'

wu

2024-07-22 b6480bb8991e83a2efd5e4835ccc8ed0e87c067a

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

@@ -103,4 +103,9 @@
    @ApiModelProperty(value = "状态", position = 16)
    private Integer state;

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