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

xiangpei

2024-07-01 55dd8a6e104190531b51402ad0be6eba0b7d6877

 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;