MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSectionAddBo.java

@@ -87,4 +87,7 @@ public class CourseSectionAddBo {
     /** 讲师ID */
     @ApiModelProperty("讲师ID")
     private Long teacherId;
+    /** 视频标签：1保利威 2腾讯 */
+    @ApiModelProperty("视频标签：1保利威 2腾讯")
+    private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseSectionEditBo.java

@@ -94,4 +94,7 @@ public class CourseSectionEditBo {
     /** 讲师ID */
     @ApiModelProperty("讲师ID")
     private Long teacherId;
+    /** 视频标签：1保利威 2腾讯 */
+    @ApiModelProperty("视频标签：1保利威 2腾讯")
+    private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseSection.java

@@ -77,4 +77,6 @@ private static final long serialVersionUID=1L;
 
     @TableField(exist = false)
     private Long oId;
+    /** 视频标签：1保利威 2腾讯 */
+    private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseSectionImport.java

@@ -74,7 +74,10 @@ public class CourseSectionImport {
     @Excel(name = "节时长")
     @ApiModelProperty("节时长(分钟)")
     private Long durationTime;
-
+    /** 视频标签：1保利威 2腾讯 */
+    @ApiModelProperty("视频标签：1保利威 2腾讯")
+    @Excel(name = "视频标签：1保利威 2腾讯")
+    private Integer viewSign;
 
     private Long educationTypeId;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseSectionVo.java

@@ -133,4 +133,8 @@ public class CourseSectionVo {
 	/** 讲师ID */
 	@ApiModelProperty("讲师ID")
 	private Long teacherId;
+
+	/** 视频标签：1保利威 2腾讯 */
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserChapterSectionVo.java

@@ -124,4 +124,7 @@ public class CourseUserChapterSectionVo {
 	@ApiModelProperty("观看时长（秒）")
 	private Long studyDuration;
 	private Long orderGoodsId;
+
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserMenuVo.java

@@ -108,5 +108,9 @@ public class CourseUserMenuVo {
 
 	@ApiModelProperty("章下节总秒数")
 	private Long totalTime;
+
+	/** 视频标签：1保利威 2腾讯 */
+	@ApiModelProperty("视频标签：1保利威 2腾讯")
+	private Integer viewSign;
 }
 

zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterSectionMapper.xml

@@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="answerNum" column="answer_num"/>
         <result property="doNum" column="do_num"/>
         <result property="teacherName" column="teacher_name"/>
+        <result property="viewSign" column="view_sign"/>
     </resultMap>
 
 

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMenuMapper.xml

@@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsId" column="goods_id"/>
         <result property="commonSign" column="common_sign"/>
         <result property="firstChoiceStatus" column="first_choice_status"/>
+        <result property="viewSign" column="view_sign"/>
     </resultMap>
 
     <select id="getList" parameterType="com.zhongzheng.modules.course.bo.CourseMenuQueryBo"  resultMap="CourseMenuResultVo">
@@ -176,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cs.live_start_time,
             cs.live_end_time,
             cs.live_url,
+            cs.view_sign,
             CASE
                 WHEN m.type = 1 THEN
                     ''
@@ -233,6 +235,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cs.live_start_time,
             cs.live_end_time,
             cs.live_url,
+            cs.view_sign,
             CASE
                 WHEN m.type = 1 THEN
                     ''