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

xiangpei

2024-07-05 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce

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

@@ -23,12 +23,17 @@
    /** 所属学科 */
    private Integer subjectId;

    /** 班级 */
    private Integer classId;

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

    /** 附件 */
    private String attachment;

    private Integer createUser;

    private Date createTime;

    private Date updateTime;