Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

luxiaotao1123

2021-08-26 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e

 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;