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

src/main/java/org/rcisoft/business/bmaterial/dao/BMaterialRepository.java

@@ -33,10 +33,10 @@ public interface BMaterialRepository extends BaseMapper<BMaterial> {
     @Insert("<script>insert into b_material " +
             " (business_id,chapter_id,file_name,file_url, " +
             " type,upload_type,file_size,flag,del_flag, " +
-            " remarks,create_by,update_by,update_date,create_date) " +
+            " remarks,create_by,update_by,update_date,create_date,file_time) " +
             " values(#{businessId},#{chapterId},#{fileName},#{fileUrl}, " +
             " #{type},#{uploadType},#{fileSize},#{flag},#{delFlag}, " +
-            " #{remarks},#{createBy},#{updateBy},#{updateDate},#{createDate}) " +
+            " #{remarks},#{createBy},#{updateBy},#{updateDate},#{createDate},#{fileTime}) " +
             "</script>")
     int insertMaterial(BMaterial bMaterial);
 

src/main/java/org/rcisoft/business/bmaterial/entity/BMaterial.java

@@ -38,6 +38,9 @@ public class BMaterial  extends IdEntity<BMaterial> {
      @ApiModelProperty(value = "课程id",required = true)
      private String lessonId;
 
+     @ApiModelProperty(value = "文件时长")
+     private String fileTime;
+
      @Transient
      private String lessonName;