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

fuliqi

2024-07-01 5c93dae79d982e3706fb3c8bfbe0a6c831554ddd

 src/main/java/com/ycl/jxkg/domain/entity/EducationResource.java

@@ -20,8 +20,8 @@
    /** 文件地址 */
    private String contentUrl;

    /** 所属分类 */
    private Integer belongType;
    /** 所属学科 */
    private Integer subjectId;

    /** 主题简介 */
    private String introduction;