Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

lsh

昨天 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

 src/main/java/com/zy/asrs/controller/MatController.java

@@ -276,6 +276,8 @@
            print.setBarcode(mat.getBarcode());
            print.setMaktx(mat.getMaktx());
            print.setSpecs(mat.getSpecs());
            print.setSupp(mat.getSupp());
            print.setSku(mat.getSku());
            print.setUnit(mat.getUnit());
            print.setMemo(mat.getMemo());
            res.add(print);