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

zc

2024-11-05 45e4ef2ecf62e32c243d72529f430c9b4f151b6b

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

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

        private Long detlId;

        // 物料编号
        private String matnr;