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

liyong

2026-05-12 0365eb9f81bd331b0adde6d77fb331213a2c7b30

 src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java

@@ -24,4 +24,7 @@
    @Excel(name = "单位")
    private String unit;

    @Excel(name = "库存量")
    private String stockInventory;

}