From a97c0e84c8d1f50aa65935643a580527f30b7ece Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 12 三月 2024 08:39:38 +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/Delivery.java | 11 ++++++-----
1 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..e7f47c5 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
@@ -14,15 +14,18 @@
private Long id;
private Integer deliveryState;
private Integer stockState;
+ private String paymentTerms;
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 salesmanId;
+ private String salesman;
+ private String creatorId;
private String creator;
private String contacts;
private String contactNumber;
@@ -33,7 +36,5 @@
private String remarks;
private LocalDate createTime;
private LocalDate updateTime;
- private Order order;
- private Customer customer;
}
--
Gitblit v1.8.0