From f20b176a682080c7358578d11d1176aa88bb4efc Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 30 一月 2024 10:51:02 +0800
Subject: [PATCH] 修改实体
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 1 +
north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
index 391f453..808ab9f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
@@ -15,14 +15,16 @@
private Integer deliveryState;
private Integer stockState;
private String deliveryId;
+ private String orderId;
private String project;
+ private String customerId;
private String customerName;
private LocalDate deliveryDate;
private String payMethod;
private LocalDate payDate;
- private String salaManId;
- private String salaMan;
- private String createrId;
+ private String saleManId;
+ private String saleMan;
+ private String creatorId;
private String creator;
private String contacts;
private String contactNumber;
@@ -33,7 +35,5 @@
private String remarks;
private LocalDate createTime;
private LocalDate updateTime;
- private Order order;
- private Customer customer;
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
index 133f92b..7b95b85 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -40,6 +40,7 @@
private LocalDate updateTime;
private Order order;
private Delivery delivery;
+ private DeliveryDetail deliveryDetail;
//private Product product;
}
--
Gitblit v1.8.0