Merge remote-tracking branch 'origin/master'

mitao

2024-03-06 51527a6e817a6ba73b29b07e94a7e879a86f8eaf

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtClassificationPageVo.java

@@ -17,7 +17,7 @@
    @ApiModelProperty(value = "分类id")
    private Long classId;

    @ApiModelProperty(value = "分类类型")
    @ApiModelProperty(value = "分类类型1鸿瑞堂2商品")
    private Integer classType;

    @ApiModelProperty(value = "分类名字")