Merge remote-tracking branch 'origin/master'

luxiaotao1123

2021-03-02 e4db9c4fc4e40d7b41ee0014aaa9feb8ba9e9bf0

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -80,6 +80,7 @@
        matCode.setMatNo(item.getMnumber()); // 物料编号
        matCode.setMatName(item.getMname()); // 物料描述
        matCode.setStr2(item.getMmodel()); // 物料类别
        matCode.setStr2(item.getMtypename());
    }

    // excel ----------------------------------------------------------------------