From 6d4c3737063c9f041a02061797f5c00851207ef0 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期一, 12 八月 2024 14:44:30 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java | 2 ++
1 files changed, 2 insertions(+), 0 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 d812cb1..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
@@ -20,6 +20,7 @@
private Integer quantity;
private Double money;
private Double price;
+ private Double otherMoney;
private String deliveryDetailRemakes;
private Integer deliveryDetailState;
private String otherColumns;
@@ -27,5 +28,6 @@
private LocalDate updateTime;
private Delivery delivery;
private OrderDetail orderDetail;
+ private Order order;
}
--
Gitblit v1.8.0