Merge remote-tracking branch 'origin/master'

NNowhZzU

2024-01-26 6f2a4980f4ca7a794b103cfde9946a905c5ba399

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java

@@ -11,6 +11,8 @@
    @TableId(type = IdType.AUTO)

    private Long id;
    private String orderId;
    private String orderNumber;
    private Integer technologyNumber;
    private String glassAddress;
    private String glassChild;