From 15fa56463061f1e94140e23e98987aa3131714bf Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 七月 2024 17:24:32 +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 |    4 +++-
 1 files changed, 3 insertions(+), 1 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 3ff75c7..d812cb1 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
@@ -17,10 +17,12 @@
     private String orderId;
     private Integer orderNumber;
     private Double area;
-    private String quantity;
+    private Integer quantity;
     private Double money;
+    private Double price;
     private String deliveryDetailRemakes;
     private Integer deliveryDetailState;
+    private String otherColumns;
     private LocalDate createTime;
     private LocalDate updateTime;
     private  Delivery delivery;

--
Gitblit v1.8.0