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

chenlu

2024-09-03 f25c0e53a507f9e435429242e9b1c974aaae29bc

 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;