Merge branch 'refs/heads/master' into openIm

fs-service/src/main/java/com/fs/course/domain/FsUserCoursePeriodDays.java

@@ -94,4 +94,8 @@ public class FsUserCoursePeriodDays extends BaseEntityTow {
     private LocalTime joinTime;
     @TableField(exist = false)
     private LocalDate maxDate;
+
+    /** 项目id */
+    private Long projectId;
+
 }

fs-service/src/main/resources/mapper/course/FsUserCoursePeriodDaysMapper.xml

@@ -26,7 +26,7 @@
     </sql>
 
     <select id="selectFsUserCoursePeriodDaysList" parameterType="FsUserCoursePeriodDays" resultType="FsUserCoursePeriodDays">
-        select a.*,b.course_name,c.title videoName from fs_user_course_period_days a
+        select a.*,b.course_name,b.project as projectId, c.title videoName from fs_user_course_period_days a
         inner join fs_user_course b on a.course_id = b.course_id
         inner join fs_user_course_video c on a.video_id = c.video_id
         <where>