blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
ZengTao
2024-09-20 34a5775085f5db40dfc80250e5185f5485eecfc2 
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java


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


    /**


     * 是否合并


     */


    private Integer merge;


    private Integer combine;






}