Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

whycq

2022-05-08 edbf54064b70a6311a98eeefc7516a35287e6b44

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -22,13 +22,13 @@
    public static class CombMat {

        // 物料编号
        private String matNo;
        private String matnr;

        // 批号
        // 序列码
        private String batch;

        // 物料数量
        private Double count;
        private Double anfme;

    }