Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

huang

2024-12-27 3c1f9d699497dcfc4b682502945a4ebee4c37e03

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

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

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

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


}