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-management/src/main/java/com/ruoyi/management/vo/SysSetVO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/SysSetVO.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/SysSetVO.java
index acaa78d..8a66379 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/SysSetVO.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/SysSetVO.java
@@ -15,7 +15,7 @@
@ApiModelProperty("分享设置 图片")
private String img;
@ApiModelProperty("音效设置 正确")
- private String right;
+ private String correct;
@ApiModelProperty("音效设置 错误")
private String error;
@ApiModelProperty("积分设置 每在线x分钟")
--
Gitblit v1.7.1