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/admin/exam/ExamPaperEditRequestVM.java |   47 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java b/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
index a611d2c..570771a 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
+++ b/src/main/java/com/mindskip/xzs/viewmodel/admin/exam/ExamPaperEditRequestVM.java
@@ -1,14 +1,11 @@
 package com.mindskip.xzs.viewmodel.admin.exam;
 
 
-
-import com.mindskip.xzs.domain.ExamPaperDepartment;
-import com.mindskip.xzs.domain.ExamPaperSubject;
-
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -48,6 +45,8 @@
 
     private Integer[][] userId;
     private String type;
+    private String status;
+    private String menuIds;
 
 
 
@@ -178,4 +177,44 @@
     public void setType(String type) {
         this.type = type;
     }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getMenuIds() {
+        return menuIds;
+    }
+
+    public void setMenuIds(String menuIds) {
+        this.menuIds = menuIds;
+    }
+
+    @Override
+    public String toString() {
+        return "ExamPaperEditRequestVM{" +
+                "id=" + id +
+                ", level=" + level +
+                ", subjectId=" + Arrays.toString(subjectId) +
+                ", paperType=" + paperType +
+                ", name='" + name + '\'' +
+                ", suggestTime=" + suggestTime +
+                ", limitDateTime=" + limitDateTime +
+                ", titleItems=" + titleItems +
+                ", score='" + score + '\'' +
+                ", departmentIds=" + Arrays.toString(departmentIds) +
+                ", userIds=" + Arrays.toString(userIds) +
+                ", subjectSource=" + subjectSource +
+                ", questionTypeVMS=" + questionTypeVMS +
+                ", aggregateSource=" + aggregateSource +
+                ", userId=" + Arrays.toString(userId) +
+                ", type='" + type + '\'' +
+                ", status='" + status + '\'' +
+                ", menuIds='" + menuIds + '\'' +
+                '}';
+    }
 }

--
Gitblit v1.8.0