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

chenlu

2024-08-27 5df5dba2a321098fd0fc7e18b71549f5c2312049

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

@@ -36,6 +36,9 @@
    private LocalDate createTime;

   @TableField(select = false,exist = false)
    private  Integer thickness;

   @TableField(select = false,exist = false)
    private  Order order;
    @TableField(select = false,exist = false)
    private OrderDetail  orderDetail;