blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wangfei
2024-10-09 33308e16bbb153d9aac76fd703ec0f38ea7e344a 
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java


@@ -144,7 +144,7 @@


    /**


     * 是否合并


     */


    private Integer merge;


    private Integer combine;






}