Merge remote-tracking branch 'origin/master'

wu

2024-05-13 e6058f7ecd0f7dcf9414d8adf2fbdff77b0baff9

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java

@@ -120,12 +120,17 @@
    /**
     * 工程号
     */
    private Integer engineerId;
    private String engineerId;

    /**
     * 生产规则id
     */
    private Integer ruleId;

    /**
     * 玻璃ID
     */
    private String glassId;


}