1、新增字典类型表接字典详情表 2、钢化前任务已设置完成，带联调

zhoushihao

2024-09-09 9c860a46c008b00179d68421f23ffced53b1ea4e

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java

@@ -141,6 +141,10 @@
     * 玻璃ID
     */
    private String glassId;
    /**
     * 是否合并
     */
    private Integer combine;


}