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

liyong

2026-05-12 a122cfc45d18b6e679029a88eb342e9081df6595

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

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

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