Merge remote-tracking branch 'origin/master'

lohir

2024-10-18 1a00df812740751806e6d17a7b5a184fe97157d4

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

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

    private Integer name;
    private String name;

    private Integer status;