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

lty

2025-05-22 8b3be4349caa74d2dd1b834a250cb45a936e727f

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

@@ -28,6 +28,10 @@
    @Data
    public static class CombMat {

        private Long detlId;

        private Integer detId;

        // 物料编号
        private String matnr;