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

Junjie

2024-05-31 93b17a7e74d8e16ac6fa30e90e9db3960736d57f

 zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java

@@ -22,9 +22,6 @@
    //组托物料
    private List<CombMat> combMats;

    //仓库ID
    private Long hostId;

    @Data
    public static class CombMat {

@@ -52,6 +49,8 @@
        // 规格
        private String specs;

        private String zpallet;

    }

}