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

mrzhssss

2022-05-27 7e45c420dd19a3ffe224e9cd42bf7ea31277d7be

 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;

    }