From 304a91f9eb9bb34996f84ba7278b109c6cf842eb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 28 十一月 2023 21:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/viewmodel/student/dashboard/PaperFilter.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/viewmodel/student/dashboard/PaperFilter.java b/src/main/java/com/mindskip/xzs/viewmodel/student/dashboard/PaperFilter.java
index 4944d0a..209a2b0 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/student/dashboard/PaperFilter.java
+++ b/src/main/java/com/mindskip/xzs/viewmodel/student/dashboard/PaperFilter.java
@@ -6,8 +6,10 @@
public class PaperFilter {
private Integer userId;
private Date dateTime;
- private Integer examPaperType;
+ private Integer[] examPaperType;
private Integer gradeLevel;
+
+ private Integer subjectId;
public Integer getUserId() {
return userId;
@@ -25,11 +27,11 @@
this.dateTime = dateTime;
}
- public Integer getExamPaperType() {
+ public Integer[] getExamPaperType() {
return examPaperType;
}
- public void setExamPaperType(Integer examPaperType) {
+ public void setExamPaperType(Integer[] examPaperType) {
this.examPaperType = examPaperType;
}
@@ -40,4 +42,12 @@
public void setGradeLevel(Integer gradeLevel) {
this.gradeLevel = gradeLevel;
}
+
+ public Integer getSubjectId() {
+ return subjectId;
+ }
+
+ public void setSubjectId(Integer subjectId) {
+ this.subjectId = subjectId;
+ }
}
--
Gitblit v1.8.0