From 42bc535c947bcf999c706a753635d35ef73f91e6 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 22 四月 2024 09:11:16 +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 | 5 +++--
1 files changed, 3 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..bdf57f8 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,17 @@
@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 LocalDate createTime;
private LocalDate updateTime;
-
private Delivery delivery;
private OrderDetail orderDetail;
--
Gitblit v1.8.0