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

guoyuji

2024-07-04 cf5330c151429e517eba72ec9fe0289b6ee98a72

 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;