Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-17 ac331ce04a2516af6ce100d8a4c93328bbebd93d

 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;