From 4ee53f8b43e850d2b35d5b1eb979d7b0bc2fbcd4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 五月 2024 10:52:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 6ebec84..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
@@ -12,16 +12,18 @@
@TableId(type = IdType.AUTO)
private Long id;
+ private String deliveryId;
private Integer deliveryNumber;
+ 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;
private OrderDetail orderDetail;
--
Gitblit v1.8.0