Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2024-07-11 5073a245f53fd5ca936e779be8c6b9b19d42f67d

 src/main/java/com/ycl/jxkg/domain/vo/admin/education/SubjectPageRequestVO.java

@@ -7,8 +7,8 @@
@Data
public class SubjectPageRequestVO extends BasePage {

    private Integer id;
    private String name;

    private Integer level;
    private Integer status;

}