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

xiangpei

2024-07-05 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce

 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;

}