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/vo/StudyPairResultVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairResultVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairResultVO.java
index 1823fdb..a1abae0 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairResultVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairResultVO.java
@@ -16,7 +16,7 @@
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel("音图相配返回信息类")
+@ApiModel(value = "音图相配返回信息类")
 public class StudyPairResultVO extends StudyModelVO {
 
     /**

--
Gitblit v1.7.1