From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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 fc219be..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
@@ -20,9 +20,11 @@
     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;

--
Gitblit v1.8.0