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

liyong

9 天以前 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28

 src/main/java/com/ruoyi/procurementrecord/bean/vo/ShippingProductVo.java

@@ -11,6 +11,9 @@
    @Schema(description = "出库单id")
    private Long id;

    @Schema(description = "产品规格id")
    private Long productModelId;

    @Schema(description = "产品大类")
    private String productCategory;