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

gongchunyi

9 天以前 bbd9823e935293b4815963647fecf48e3ba7ee1b

 src/main/java/com/ruoyi/purchase/vo/PurchaseStockInProductVo.java

@@ -13,7 +13,7 @@
    private Long id;

    @Schema(description = "销售台账的产品id")
    private Long saleLedgerProductId;
    private Long salesLedgerProductId;

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