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

chenlu

2024-12-06 85741906046ab01e6b824e7e306a1f332c25f2f4

 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;