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

fuliqi

2024-07-01 a745c3b358b97b468711a0ecac11dbe2d5d24018

 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;