From cac51e7aacded53a855a65d02ea6c57305ea15fe Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 05 七月 2024 09:43:24 +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/Order.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
index 0a27f16..c483c63 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
@@ -26,7 +26,7 @@
     private String orderClassify;
     private String icon;
     private String packType;
-    private String deliveryDate;
+    private LocalDate deliveryDate;
     private String batch;
     private Integer calculateType;
     private Integer salesmanId;
@@ -44,7 +44,7 @@
     private String otherRemarks;
     private Double area;
     private Long quantity;
-    private String perimeter;
+    private Double perimeter;
     private String verifierId;
     private String verifier;
     private String creatorId;

--
Gitblit v1.8.0