From 05ebcccc2c8099c0252501fea0e1797e5a1361d2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 15 七月 2020 10:59:46 +0800
Subject: [PATCH] Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs
---
src/main/java/com/zy/common/utils/excel/ExcelUtils.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java b/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
index 61cc2a7..561cb39 100644
--- a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
+++ b/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
@@ -34,7 +34,6 @@
data.setBarcode("80001854");
data.setMatName("閾濆甫|1100-O|0.33*475|");
data.setStr1("701010015907");
- data.setStr2("榧庤儨閾濅笟棣欐腐_椹潵瑗夸簹UPT");
list.add(data);
}
return list;
--
Gitblit v1.9.1