From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/SubjectDTO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/SubjectDTO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/SubjectDTO.java
index 9621251..83a1c93 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/SubjectDTO.java
+++ b/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;
--
Gitblit v1.7.1