合并

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -68,6 +68,6 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
     List<ClassGradeUserGoodsVo> selectOfficialNotPush(UserQueryBo bo);
 
     List<ClassGradeUserGoodsVo> selectPeriodNotPush(UserQueryBo bo);
-    
+
 
 }

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

@@ -53,10 +53,7 @@
         <result property="periodWaitTime" column="period_wait_time"/>
         <result property="periodStatus" column="period_status"/>
         <result property="periodStatusNum" column="period_status_num"/>
-<<<<<<< HEAD
         <result property="periodIngTime" column="period_ing_time"/>
-=======
->>>>>>> pre
     </resultMap>
 
 
@@ -110,10 +107,6 @@
         <result property="classStartTime" column="class_start_time"/>
         <result property="classEndTime" column="class_end_time"/>
         <result property="periodStatusNum" column="period_status_num"/>
-<<<<<<< HEAD
-=======
-
->>>>>>> pre
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodUserVo" id="ClassPeriodUserVo">