From 1918c5fe8c390ca90acff60b71e27257d65fb463 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 24 一月 2022 10:21:54 +0800
Subject: [PATCH] Merge branch 'sxjzasrs' of http://47.97.1.152:5880/r/zy-asrs into sxjzasrs0

---
 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