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/CompleteGameDTO.java | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteGameDTO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteGameDTO.java
index dbee09b..6a09955 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteGameDTO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/CompleteGameDTO.java
@@ -47,10 +47,4 @@
@ApiModelProperty("根据正确率计算可获得积分数量")
private Integer availableIntegral;
- /**
- * 完成听故事、完成游戏、完成答题、完成每日学习、商城消费
- */
- @ApiModelProperty("完成听故事、完成游戏、完成答题、完成每日学习、商城消费")
- private String method;
-
}
--
Gitblit v1.7.1