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

xiangpei

2024-06-25 8f20b8b0442e484220352455addc8c2e6945b153

 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;