义乌上片后端接口及前端页面样式与调用

wangfei

2024-11-08 3c4b340b58d0d0bdbc3db74b5721586dd964f86c

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

@@ -144,7 +144,7 @@
    /**
     * 是否合并
     */
    private Integer merge;
    private Integer combine;


}