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

liyong

7 天以前 f5ee8e7afb178179c1d1d078cf42fe33dc7607f9

 src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java

@@ -15,6 +15,9 @@
@Data
public class ProductModelExportDto {

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

    @Excel(name = "规格型号")
    private String model;