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

zss

2 天以前 dd470a03e64db4757148df1265533476352837c8

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

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

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

    /**