fix 合并

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeStudentVo.java

@@ -163,5 +163,8 @@ public class ClassGradeStudentVo {
 	@Excel(name = "复购老订单商品ID")
 	@ApiModelProperty("复购老订单商品ID")
 	private Long rebuyOrderGoodsId;
-
+	/** 是否学时推送 0未推送 1推送 */
+	@Excel(name = "是否学时推送 0未推送 1推送")
+	@ApiModelProperty("是否学时推送 0未推送 1推送")
+	private Integer periodPlush;
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -152,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="interfacePushId" column="interface_push_id"/>
         <result property="periodPlush" column="period_plush"/>
         <result property="rebuyOrderGoodsId" column="rebuy_order_goods_id"/>
+        <result property="periodPlush" column="period_plush"/>
     </resultMap>
 
 
@@ -307,6 +308,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (SELECT g.class_hours FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where cg.grade_id = cgg.grade_id) as class_hours,
         cgu.period_status,
         cgu.finish_status,
+        cgu.period_plush,
         (SELECT g.study_start_time FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where cg.grade_id = cgg.grade_id) as study_start_time,
         (SELECT g.study_end_time FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where cg.grade_id = cgg.grade_id) as study_end_time,
         cg.class_start_time,