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

guoyujie

2025-08-05 1840174da20f984abb7cb8d5cd18f1a01448ae97

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

@@ -54,6 +54,8 @@
    @TableField(select = false,exist= false)
    private Order order;
    @TableField(select = false,exist= false)
    private OrderGlassDetail orderGlassDetail;
    @TableField(select = false,exist= false)
    private Delivery delivery;
    @TableField(select = false,exist= false)
    private DeliveryDetail deliveryDetail;