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

zyx

2024-06-26 358d17658629931964ad421be77c94240310ed63

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

@@ -23,6 +23,8 @@

    @Data
    public static class CombMat {
        //订单编号
        private String orderNo;

        // 物料编号
        private String matnr;