From a8ab74fdbc4e590a4c9778d447538c3bc30925e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 08:54:44 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs into gdasrs
---
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 c78eebd..58e2130 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
@@ -18,34 +18,34 @@
@ExcelProperty(value= "鐗╂枡鍚嶇О", index = 2)
private String matName;
- @ExcelProperty(value= "鍩烘湰鍗曚綅", index = 8)
+ @ExcelProperty(value= "鐗╂枡鍗曚綅", index = 8)
private String str1;
- @ExcelProperty(value= "鐗╂枡绫诲埆", index = 3)
+ @ExcelProperty(value= "鐗╂枡瑙勬牸", index = 3)
private String str2;
- @ExcelProperty(value= "瑙勬牸鍨嬪彿", index = 5)
+ @ExcelProperty(value= "棰滆壊", index = 5)
private String str3;
- @ExcelProperty(value= "鐘舵��", index = 6)
+ @ExcelProperty(value= "瀹㈡埛", index = 6)
private String str4;
- @ExcelProperty(value= "鍔╄鐮�", index = 7)
+// @ExcelProperty(value= "鍔╄鐮�", index = 7)
private String str5;
- @ExcelProperty(value= "榛樿渚涘簲鍟�", index = 10)
+// @ExcelProperty(value= "榛樿渚涘簲鍟�", index = 10)
private String str6;
- @ExcelProperty(value= "榛樿浠撳簱", index = 13)
+// @ExcelProperty(value= "榛樿浠撳簱", index = 13)
private String str7;
- @ExcelProperty(value= "鍝佺墝", index = 9)
+// @ExcelProperty(value= "鍝佺墝", index = 9)
private String str8;
- @ExcelProperty(value= "閲囪喘鍛�", index = 11)
+// @ExcelProperty(value= "閲囪喘鍛�", index = 11)
private String str9;
- @ExcelProperty(value= "浜у湴", index = 12)
+// @ExcelProperty(value= "浜у湴", index = 12)
private String str10;
// @ExcelProperty(value= "搴忓垪鍙风鐞�")
@@ -63,31 +63,31 @@
// @ExcelProperty(value= "淇濊川鏈�")
private String str15;
- @ExcelProperty(value= "鍙攢鍞�", index = 20)
+// @ExcelProperty(value= "鍙攢鍞�", index = 20)
private String str16;
- @ExcelProperty(value= "鍙噰璐�", index = 21)
+// @ExcelProperty(value= "鍙噰璐�", index = 21)
private String str17;
- @ExcelProperty(value= "鍙负瀛愪欢", index = 22)
+// @ExcelProperty(value= "鍙负瀛愪欢", index = 22)
private String str18;
- @ExcelProperty(value= "鍙负缁勪欢", index = 23)
+// @ExcelProperty(value= "鍙负缁勪欢", index = 23)
private String str19;
// @ExcelProperty(value= "杈呭姪灞炴�х鐞�")
private String str20;
- @ExcelProperty(value= "鎴愭湰璁＄畻鏂规硶", index = 29)
+// @ExcelProperty(value= "鎴愭湰璁＄畻鏂规硶", index = 29)
private String str21;
- @ExcelProperty(value= "閲囪喘鍗曚綅", index = 30)
+// @ExcelProperty(value= "閲囪喘鍗曚綅", index = 30)
private String str22;
- @ExcelProperty(value= "閿�鍞崟浣�", index = 31)
+// @ExcelProperty(value= "閿�鍞崟浣�", index = 31)
private String str23;
-// @ExcelProperty(value= "棰勮澶╂暟")
+ @ExcelProperty(value= "閲嶉噺", index = 7)
private Double num1;
// @ExcelProperty(value= "鏈�浣庡簱瀛樻暟閲�")
--
Gitblit v1.9.1