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

whycq

2023-10-11 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547

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

@@ -16,6 +16,9 @@
    // 托盘条码
    private String barcode;

    // 是否冻结
    private Integer frozen;

    private List<CombMat> combMats;

    @Data
@@ -24,12 +27,19 @@
        // 物料编号
        private String matnr;

        // 批号
        // 序列码
        private String batch;

        // 物料数量
        private Double anfme;

        // 备注
        private String memo;

        private Long owner;

        private String cstmr;

    }

}