From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/service/ExamPaperService.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
index 9786fe4..6e19f57 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamPaperService.java
@@ -1,6 +1,7 @@
 package com.ycl.jxkg.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.jxkg.base.Result;
 import com.ycl.jxkg.domain.entity.ExamPaper;
 import com.ycl.jxkg.domain.entity.User;
 import com.ycl.jxkg.domain.form.ExamPaperForm;
@@ -18,11 +19,11 @@
 
     PageInfo<ExamResponseVO> page(ExamPaperPageRequestVO requestVM);
 
-    PageInfo<ExamPaper> taskExamPage(ExamPaperPageRequestVO requestVM);
+//    PageInfo<ExamPaper> taskExamPage(ExamPaperPageRequestVO requestVM);
 
     PageInfo<ExamPaper> studentPage(ExamPaperPageVO requestVM);
 
-    ExamPaper savePaperFromVM(ExamPaperEditRequestVO examPaperEditRequestVO, User user);
+//    ExamPaper savePaperFromVM(ExamPaperEditRequestVO examPaperEditRequestVO, User user);
 
     ExamPaperEditRequestVO examPaperToVM(Integer id);
 
@@ -41,7 +42,7 @@
      */
     List<ExamPaper> myExamPaper(Integer paperType);
 
-    void addPaper(ExamPaperForm form);
+    Result addPaper(ExamPaperForm form);
 
-    void updateExamPaper(ExamPaperForm form);
+    Result updateExamPaper(ExamPaperForm form);
 }

--
Gitblit v1.8.0