From eea44a94c998e69c33d52b39baf65bf944f0f768 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 14 十月 2025 14:51:07 +0800
Subject: [PATCH] 提交 vxe最新版本冲突回退到之前版本
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java
index 3ff75c7..11b3022 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java
@@ -17,13 +17,18 @@
private String orderId;
private Integer orderNumber;
private Double area;
- private String quantity;
+ private Integer quantity;
private Double money;
+ private Double price;
+ private Double otherMoney;
private String deliveryDetailRemakes;
private Integer deliveryDetailState;
+ private String otherColumns;
+ private String boxNo;
private LocalDate createTime;
private LocalDate updateTime;
private Delivery delivery;
private OrderDetail orderDetail;
+ private Order order;
}
--
Gitblit v1.8.0