From f8e95211e4d4e181f65d4548d61959d75cd5de32 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 25 四月 2024 16:14:24 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java |    3 ++-
 1 files changed, 2 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..d9eadb5 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,11 @@
     private String orderId;
     private Integer orderNumber;
     private Double area;
-    private String quantity;
+    private Integer quantity;
     private Double money;
     private String deliveryDetailRemakes;
     private Integer deliveryDetailState;
+    private String otherColumns;
     private LocalDate createTime;
     private LocalDate updateTime;
     private  Delivery delivery;

--
Gitblit v1.8.0