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

liyong

9 天以前 79c1c457302663154f23325116614cf33d8f575b

 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;