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

liyong

2 天以前 dbd7fd484b5c7ed00cb895f227645848c3677c08

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

@@ -37,6 +37,10 @@
    @Excel(name = "规格型号")
    private String model;

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

    /**
     * 单位
     */