From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java | 10 ++++++++--
1 files changed, 8 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..11b3022 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,23 @@
@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 String boxNo;
private LocalDate createTime;
private LocalDate updateTime;
-
private Delivery delivery;
private OrderDetail orderDetail;
+ private Order order;
}
--
Gitblit v1.8.0