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

chenlu

2024-07-08 4c368a7d1f0bb452b4cbb063a86701b571a01a95

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

@@ -12,6 +12,7 @@
    @TableId(type = IdType.AUTO)
    private Long id;
    private String productName;
    private String productAbbreviation;
    private String typeId;
    private String typeName;
    private Double totalThickness;