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

xiangpei

2024-07-01 55dd8a6e104190531b51402ad0be6eba0b7d6877

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

@@ -30,9 +30,9 @@
    private UploadFile contentUrl;
    private String contentUrlString;

    /** 所属分类 */
    @NotNull(message = "请选择分类")
    private Integer belongType;
    /** 所属学科 */
    @NotNull(message = "请选择学科")
    private Integer subjectId;

    private String typeName;