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

chenlu

2024-08-15 b1c49ce18f24c7cf89c2b938f2737dba611d30ee

 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;