feat: 修复代码冲突

hjl

2024-06-06 c62e9f81b2072473b084abb30f7c005ed341a336

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/SubjectDTO.java

@@ -19,7 +19,7 @@
    @ApiModelProperty(value = "图片",required = true)
    private String img;
    @ApiModelProperty(value = "正确语音",required = true)
    private String right;
    private String correct;
    @ApiModelProperty(value = "错误语音 多个逗号拼接")
    private String error;