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

Pu Zhibing

2 天以前 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtClassificationPageDto.java

@@ -17,5 +17,6 @@
    @ApiModelProperty(value = "分类类型1鸿瑞堂2商品")
    private Integer classType;


    @ApiModelProperty(value = "分类类型1鸿瑞堂2商品")
    private String className;
}