From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
index 6439522..a61df20 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
@@ -53,7 +53,7 @@
private String str5;
// @ExcelProperty(value= "榛樿渚涘簲鍟�", index = 10)
- private String str6;
+ private double str6;
// @ExcelProperty(value= "榛樿浠撳簱", index = 13)
private String str7;
@@ -85,7 +85,7 @@
public MatCodeExcel() {
}
- public MatCodeExcel(String matNo, String barcode, String matName,String specs,String unit,String size,String color,Double weight, String str1, String str2, String str3, String str4, String str5, String str6, String str7, String str8, String str9, String str10,Double num1, Double num2, Double num3, Double num4, Double num5) {
+ public MatCodeExcel(String matNo, String barcode, String matName,String specs,String unit,String size,String color,Double weight, String str1, String str2, String str3, String str4, String str5, Double str6, String str7, String str8, String str9, String str10,Double num1, Double num2, Double num3, Double num4, Double num5) {
this.matNo = matNo;
this.barcode = barcode;
this.matName = matName;
--
Gitblit v1.9.1