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/controller/wx/student/ExamPaperController.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java index 370ad00..fe2f885 100644 --- a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java +++ b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperController.java @@ -2,19 +2,18 @@ import com.ycl.jxkg.base.Result; import com.ycl.jxkg.controller.wx.BaseWXApiController; -import com.ycl.jxkg.domain.ExamPaper; -import com.ycl.jxkg.domain.Subject; +import com.ycl.jxkg.domain.entity.ExamPaper; +import com.ycl.jxkg.domain.entity.Subject; import com.ycl.jxkg.service.ExamPaperService; import com.ycl.jxkg.service.SubjectService; import com.ycl.jxkg.utils.DateTimeUtil; import com.ycl.jxkg.utils.PageInfoHelper; -import com.ycl.jxkg.vo.admin.exam.ExamPaperEditRequestVO; -import com.ycl.jxkg.vo.student.exam.ExamPaperPageResponseVO; -import com.ycl.jxkg.vo.student.exam.ExamPaperPageVO; +import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO; +import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageResponseVO; +import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO; import com.github.pagehelper.PageInfo; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -- Gitblit v1.8.0