From c7631c62aac9c97e80ed59ebb2eebd4a314e0784 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 四月 2024 13:55:15 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 808ab9f..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,6 +14,7 @@
private Long id;
private Integer deliveryState;
private Integer stockState;
+ private String paymentTerms;
private String deliveryId;
private String orderId;
private String project;
@@ -22,8 +23,8 @@
private LocalDate deliveryDate;
private String payMethod;
private LocalDate payDate;
- private String saleManId;
- private String saleMan;
+ private String salesmanId;
+ private String salesman;
private String creatorId;
private String creator;
private String contacts;
--
Gitblit v1.8.0