From 946f0711b0b15a3da1b84edbb5d8aadd6f63dff1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 17 二月 2025 08:30:46 +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/DeliveryDetail.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java
index 6ebec84..dba87c4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java
@@ -12,17 +12,22 @@
@TableId(type = IdType.AUTO)
private Long id;
+ private String deliveryId;
private Integer deliveryNumber;
+ private String orderId;
private Integer orderNumber;
private Double area;
- private String quantity;
+ private Integer quantity;
private Double money;
+ private Double price;
+ private Double otherMoney;
private String deliveryDetailRemakes;
private Integer deliveryDetailState;
+ private String otherColumns;
private LocalDate createTime;
private LocalDate updateTime;
-
private Delivery delivery;
private OrderDetail orderDetail;
+ private Order order;
}
--
Gitblit v1.8.0