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

廖井涛

2024-02-27 926a1e8b90381c7aa085d5462d78de9d2cc6034d

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

@@ -9,11 +9,14 @@
    @TableId(type = IdType.AUTO)

    private Long id;
    private String orderId;
    private String orderNumber;
    private Integer technologyNumber;
    private String process;
    private Integer reportingworkNum;
    private Integer brokenNum;

    private Order order;
    private OrderDetail orderDetail;
    private Product product;
//    private Order order;
//    private OrderDetail orderDetail;
//    private Product product;
}