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

xiangpei

2024-07-01 55dd8a6e104190531b51402ad0be6eba0b7d6877

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

@@ -2,7 +2,6 @@

import lombok.Data;


import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

@@ -15,9 +14,6 @@
    private String name;

    @NotNull
    private Integer level;

    @NotBlank
    private String levelName;
    private Integer itemOrder;

}