Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

2026-05-19 9eaeeab4b33927fe0f9c428ebf44b62bd8788b0d

 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;