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

zjj

2023-05-31 298285bf63c0cec97fab0c64df4c010c5d2aebe6

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

@@ -27,6 +27,9 @@
    @Data
    public static class CombMat {

        // 单据编号
        private String orderNo;

        // 物料编号
        private String matnr;