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

jenkins

2026-05-21 798a2095478f5368377d0121fb17e991ed04c56c

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

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

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

    /**
     * 单位
     */