Merge remote-tracking branch 'origin/master'

于杰

2025-07-25 9d80c05bdbc18b4d7778828d411deb9b603f6a4b

 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;