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

zss

3 天以前 dd470a03e64db4757148df1265533476352837c8

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

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

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

    /**
     * 单位
     */