From 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 29 十月 2024 13:32:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/ycl/jxkg/service/TaskExamService.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/service/TaskExamService.java b/src/main/java/com/ycl/jxkg/service/TaskExamService.java index 9265cfe..86b505f 100644 --- a/src/main/java/com/ycl/jxkg/service/TaskExamService.java +++ b/src/main/java/com/ycl/jxkg/service/TaskExamService.java @@ -1,20 +1,21 @@ package com.ycl.jxkg.service; -import com.ycl.jxkg.domain.TaskExam; -import com.ycl.jxkg.domain.User; -import com.ycl.jxkg.viewmodel.admin.task.TaskPageRequestVM; -import com.ycl.jxkg.viewmodel.admin.task.TaskRequestVM; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.jxkg.domain.entity.TaskExam; +import com.ycl.jxkg.domain.entity.User; +import com.ycl.jxkg.domain.vo.admin.task.TaskPageRequestVO; +import com.ycl.jxkg.domain.vo.admin.task.TaskRequestVO; import com.github.pagehelper.PageInfo; import java.util.List; -public interface TaskExamService extends BaseService<TaskExam> { +public interface TaskExamService extends IService<TaskExam> { - PageInfo<TaskExam> page(TaskPageRequestVM requestVM); + PageInfo<TaskExam> page(TaskPageRequestVO requestVM); - void edit(TaskRequestVM model, User user); + void edit(TaskRequestVO model, User user); - TaskRequestVM taskExamToVM(Integer id); + TaskRequestVO taskExamToVM(Integer id); List<TaskExam> getByGradeLevel(Integer gradeLevel); } -- Gitblit v1.8.0