Merge branch 'dev_New_pro' into dev_山西_晋和园_pro

gongchunyi

2026-05-16 c5aac1b321d3840a56ccc41108d42b389d68681e

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

@@ -38,7 +38,6 @@
    private String model;

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

    /**