From 7e0fe9378b0a4180d0bd1d74f6744285ebacdfdb Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期五, 11 七月 2025 12:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/srjtasrs' into srjtasrs
---
src/main/java/com/zy/common/entity/OrderGiftProofreadingExcel.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/entity/OrderGiftProofreadingExcel.java b/src/main/java/com/zy/common/entity/OrderGiftProofreadingExcel.java
index 99b2ae8..5837c70 100644
--- a/src/main/java/com/zy/common/entity/OrderGiftProofreadingExcel.java
+++ b/src/main/java/com/zy/common/entity/OrderGiftProofreadingExcel.java
@@ -18,9 +18,10 @@
private String matnr;
private String batch;
private String model;
- private String price;
- private String weight;
- private String volume;
+ private Double price;
+ private Double weight;
+ private Double volume;
+ private String specs;
private String memo;
}
--
Gitblit v1.9.1