From 008be75ef25dd2c7e8553fe79ec25722f4c2ea48 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 31 五月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/SubjectService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/SubjectService.java b/src/main/java/com/ycl/jxkg/service/SubjectService.java
index 47af5ee..7391b68 100644
--- a/src/main/java/com/ycl/jxkg/service/SubjectService.java
+++ b/src/main/java/com/ycl/jxkg/service/SubjectService.java
@@ -1,12 +1,13 @@
package com.ycl.jxkg.service;
-import com.ycl.jxkg.domain.Subject;
-import com.ycl.jxkg.viewmodel.admin.education.SubjectPageRequestVM;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.jxkg.domain.entity.Subject;
+import com.ycl.jxkg.vo.admin.education.SubjectPageRequestVO;
import com.github.pagehelper.PageInfo;
import java.util.List;
-public interface SubjectService extends BaseService<Subject> {
+public interface SubjectService extends IService<Subject> {
List<Subject> getSubjectByLevel(Integer level);
@@ -14,5 +15,5 @@
Integer levelBySubjectId(Integer id);
- PageInfo<Subject> page(SubjectPageRequestVM requestVM);
+ PageInfo<Subject> page(SubjectPageRequestVO requestVM);
}
--
Gitblit v1.8.0