Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

7 天以前 3650353733971d879fce9c1cf27ff77c7e1ae77a

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

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

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

    /**