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

fuliqi

2024-07-04 b911167866ad611a7f266d846bb15c21ae7540f4

 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;