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/domain/TSubjectRecord.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java
index aabba04..75a9d06 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java
@@ -30,20 +30,24 @@
* 用户id
*/
@ApiModelProperty(value = "用户id")
- private Integer userId;/**
+ private Integer userId;
/**
+ * /**
* 所属周目
*/
@ApiModelProperty(value = "所属周目")
- private Integer week;/**
+ private Integer week;
+ /**
* 学习进度dayXX
*/
@ApiModelProperty(value = "学习进度dayXX ")
- private Integer day;/**
+ private Integer day;
+ /**
* 上次回答到的题组id
*/
@ApiModelProperty(value = "上次回答到的题组id")
- private Integer beforeSubject;/**
+ private Integer beforeSubject;
+ /**
* 类型1听音选图2看图选音3归纳排除4有问有答5音图相配
*/
@ApiModelProperty(value = "类型1听音选图2看图选音3归纳排除4有问有答5音图相配")
@@ -53,6 +57,5 @@
*/
@ApiModelProperty(value = "已回答正确的题目id 多个逗号隔开")
private String completeSubject;
-
}
--
Gitblit v1.7.1