From 65e918de84f0798f208d4a8222393623e890d556 Mon Sep 17 00:00:00 2001 From: chenlu <1320612696@qq.com> Date: 星期六, 03 二月 2024 13:27:09 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderProcessDetail.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderProcessDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderProcessDetail.java index 22ed0fe..1953eb8 100644 --- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderProcessDetail.java +++ b/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; } -- Gitblit v1.8.0