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

chenlu

2024-07-05 31dd633b16c89af8eef7c4dfbc99819db4e7fc3f

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

@@ -34,12 +34,9 @@
    private Integer group;
    private LocalDate productionTime;
    private LocalDate createTime;

   @TableField(select = false,exist = false)
    private  Order order;
    //@TableField(select = false)
//   @ManyToOne(fetch = FetchType.LAZY)
    @TableField(select = false,exist = false)
    private OrderDetail  orderDetail;


}