From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/domain/entity/EducationResource.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/domain/entity/EducationResource.java b/src/main/java/com/ycl/jxkg/domain/entity/EducationResource.java
index ea6b7dc..5585083 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/EducationResource.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/EducationResource.java
@@ -20,8 +20,11 @@
     /** 鏂囦欢鍦板潃 */
     private String contentUrl;
 
-    /** 鎵�灞炲垎绫� */
-    private Integer belongType;
+    /** 鎵�灞炲绉� */
+    private Integer subjectId;
+
+    /** 鐝骇 */
+    private Integer classId;
 
     /** 涓婚绠�浠� */
     private String introduction;
@@ -29,6 +32,8 @@
     /** 闄勪欢 */
     private String attachment;
 
+    private Integer createUser;
+
     private Date createTime;
 
     private Date updateTime;

--
Gitblit v1.8.0