Merge remote-tracking branch 'origin/master'

yn147

2023-05-10 96286178ee1c257c130cb2ad964a781f36c4eee5

 src/main/java/com/qxueyou/scc/teach/live/model/MediaVideoLive.java

@@ -284,6 +284,10 @@
   /**  唐桥加入课堂密码 */
   @Column(name="TQ_MEETING_PWD", length=32)
   private String meetingPwd;

   /**  第三方直播入口 */
   @Column(name="COURSE_ID", length=32)
   private int courseId;
   
   @OneToMany(fetch = FetchType.LAZY, mappedBy = "videoLive")
   @JsonIgnore
@@ -720,8 +724,17 @@
      return subject;
   }

   public int getCourseId() {
      return courseId;
   }

   public void setCourseId(int courseId) {
      this.courseId = courseId;
   }

   public void setSubject(Subject subject) {
      this.subject = subject;
   }

   
}
}