Merge remote-tracking branch 'origin/master'

xiangpei

2024-06-05 7457e3aa4f2e0f640a08b35f47de1eabd555d7bf

 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.domain.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);
}