From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 | 6 ++++++
1 files changed, 6 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..be8252a 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,11 @@
private Double area;
private Integer quantity;
private Double money;
+ private Double otherMoney;
+ private Double freight;
+ private Integer freightQuantity;
+ private Double freightPrice;
+ private Integer printingNumber;
private String remarks;
private LocalDate createTime;
private LocalDate updateTime;
--
Gitblit v1.8.0