Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

buhuazhen

2026-05-09 7496e718f10286651b9e2d08a8b8548cd3b242b6

 src/main/java/com/ruoyi/basic/pojo/ProductModel.java

@@ -79,4 +79,10 @@
    @Schema(description = "顶部父产品id")
    @TableField(exist = false)
    private Long topProductParentId;

    /**
     * 库存量
     */
    @Schema(description = "库存量")
    private BigDecimal stockInventory;
}