Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

17 小时以前 c15e67c83394c1734eb4e9802d8f343c6076efc1

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

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

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

    /**