From f7ca9752b8cc4d81d75a23bbcd89227a2e3abe69 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 24 十二月 2025 07:59:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
index e7f47c5..1a53325 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
@@ -33,8 +33,15 @@
     private Double area;
     private Integer quantity;
     private Double money;
+    private Double otherMoney;
+    private Double freight;
+    private Integer freightQuantity;
+    private Double freightPrice;
+    private Integer printingNumber;
     private String remarks;
     private LocalDate createTime;
     private LocalDate updateTime;
 
+    private Order order;
+
 }

--
Gitblit v1.8.0