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

zss

8 天以前 c483ee040589c0063724059228e7e6c8e4ff943c

 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;