Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

6 天以前 dc9c6c612cde7b938c6851383b9da99abab025a4

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

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

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

    /**