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

chenlu

2024-09-05 cb05a90ebb7d71099a66fb03382cc93a4fa0a8ee

 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;

}