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/service/ITIntegralRecordService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java
index 3b07b34..cc51dbe 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITIntegralRecordService.java
@@ -23,14 +23,16 @@
* @param time yyyy-mm格式时间
* @return 分页列表
*/
- IPage<TIntegralRecord> integralDetail(Page<TIntegralRecord> page, Long userId, String time);
+ IPage<TIntegralRecord> integralDetail(Page<TIntegralRecord> page, Integer userId, String time);
/**
* 生成积分明细
*
* @param integral 积分 (增加积分+ 、减少积分-)
* @param method 积分来源
+ * @param gameId 游戏id
+ * @param storyId 故事id
* @return 操作结果
*/
- Boolean add(String integral, String method);
+ Boolean add(String integral, String method, Integer gameId, Integer storyId);
}
--
Gitblit v1.7.1