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/SubjectService.java | 22 ++++++++++++++++++----
1 files changed, 18 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 f2fc5f0..c5b3a6f 100644
--- a/src/main/java/com/ycl/jxkg/service/SubjectService.java
+++ b/src/main/java/com/ycl/jxkg/service/SubjectService.java
@@ -1,9 +1,10 @@
package com.ycl.jxkg.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ycl.jxkg.domain.Subject;
-import com.ycl.jxkg.vo.admin.education.SubjectPageRequestVO;
+import com.ycl.jxkg.domain.entity.Subject;
+import com.ycl.jxkg.domain.vo.admin.education.SubjectPageRequestVO;
import com.github.pagehelper.PageInfo;
+import com.ycl.jxkg.domain.vo.admin.education.SubjectResponseVO;
import java.util.List;
@@ -13,7 +14,20 @@
List<Subject> allSubject();
- Integer levelBySubjectId(Integer id);
+ PageInfo<SubjectResponseVO> page(SubjectPageRequestVO requestVM);
- PageInfo<Subject> page(SubjectPageRequestVO requestVM);
+ /**
+ * 鑾峰彇鏈�鏂伴『搴�
+ *
+ * @return 椤哄簭
+ */
+ Integer getItemOrder();
+
+ /**
+ * 鏇存柊鐘舵��
+ *
+ * @param subject 鍙傛暟
+ * @return 缁撴灉
+ */
+ Boolean updateStatus(Subject subject);
}
--
Gitblit v1.8.0