Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zc

2025-06-05 7abc1ed37a17dc7a46289e9373c51d0d38dd11f3

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

@@ -22,8 +22,12 @@

    private List<CombMat> combMats;


    @Data
    public static class CombMat {

        // 条码
        private String threeCode;

        // 物料编号
        private String matnr;
@@ -40,6 +44,12 @@
        // 规格
        private String specs;

        private String supp;

        private String temp1;

        private String temp2;

    }

}