Merge remote-tracking branch 'origin/master'

于杰

2025-08-04 fd89fbfa59d40f4016b43bcac8286bdcdb5e4df9

 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;