From f4e8f069d050293232cfe68ebd38b2b05c4ad4b4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 12 七月 2024 11:41:30 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 8509248..d7e680d 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;
@@ -32,6 +33,10 @@
private Double area;
private Integer quantity;
private Double money;
+ private Double otherMoney;
+ private Double freight;
+ private Integer freightQuantity;
+ private Double freightPrice;
private String remarks;
private LocalDate createTime;
private LocalDate updateTime;
--
Gitblit v1.8.0