Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-05-29 a85adf40d5e30d3b9e2a848cf8fd073998ff5c8b

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

@@ -10,7 +10,7 @@
    private Integer id;
    private Integer level;
    private String belong;
    private String typeID;
    private String typeId;
    private String typeName;
    private String createTime;