Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-05 cac51e7aacded53a855a65d02ea6c57305ea15fe

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java

@@ -62,6 +62,8 @@
    private String levelTwo;
    @TableField(exist= false)
    private String totalThickness;
    @TableField(exist= false)
    private Integer differentSize;//用于标签打印时  明细是否显示
    //private Product product;

}