Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-30 10ca479bf55120b338f9d2c6b1e3100190b5a035

 src/main/java/com/mindskip/xzs/repository/SubjectMapper.java

@@ -12,7 +12,7 @@

    List<Subject> getSubjectByLevel(Integer level);

    List<Subject> allSubject();
    List<Subject> allSubject(@Param("deptIds") List<Integer> deptIds, @Param("admin") Boolean admin);

    List<Subject> page(SubjectPageRequestVM requestVM);