From 402aba359adb4b10cfa98ad7fcb424eb55641129 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 七月 2024 15:54:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish

---
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TSubjectRecord.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 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 75a9d06..b25b255 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
@@ -1,6 +1,7 @@
 package com.ruoyi.study.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.web.domain.BaseModel;
@@ -45,12 +46,12 @@
     /**
      * 上次回答到的题组id
      */
-    @ApiModelProperty(value = "上次回答到的题组id")
-    private Integer beforeSubject;
+    @ApiModelProperty(value = "上次回答到的题组id(, 拼接)")
+    private String beforeSubject;
     /**
      * 类型1听音选图2看图选音3归纳排除4有问有答5音图相配
      */
-    @ApiModelProperty(value = "类型1听音选图2看图选音3归纳排除4有问有答5音图相配")
+    @ApiModelProperty(value = "类型1:听音选图,2:看图选音,3:归纳排除,4:有问有答,5:音图相配")
     private Integer type;
     /**
      * 已回答正确的题目id 多个逗号隔开
@@ -58,4 +59,18 @@
     @ApiModelProperty(value = "已回答正确的题目id 多个逗号隔开")
     private String completeSubject;
 
+    /**
+     * 答题次数
+     */
+    @ApiModelProperty(value = "答题次数")
+    @TableField("answerNumber")
+    private Integer answerNumber;
+
+    /**
+     * 答题正确次数
+     */
+    @ApiModelProperty(value = "答题正确次数")
+    @TableField("correctNumber")
+    private Integer correctNumber;
+
 }

--
Gitblit v1.7.1