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

liyong

2026-05-08 f28313ee91fdc90d9879677253b41948d1645609

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

@@ -37,6 +37,10 @@
    @Excel(name = "规格型号")
    private String model;

    @Excel(name = "产品编码")
    @TableField("product_code")
    private String productCode;

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

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