Merge branch 'active_course_2021-09-26～29' of http://git.dayaedu.com/yonge/mec into 2021-double-eleven

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -250,6 +250,9 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.VipGroup">
         UPDATE vip_group
         <set>
+            <if test="courseStartDate != null">
+                courses_start_date = #{courseStartDate},
+            </if>
             <if test="paymentExpireDate != null">
                 payment_expire_date_ = #{paymentExpireDate},
             </if>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherPracticeGroupController.java

@@ -88,7 +88,6 @@ public class TeacherPracticeGroupController extends BaseController {
 		for (CourseSchedule courseSchedule : practiceGroupApplyDto.getCourseSchedules()) {
 			courseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(), applyBaseInfo.getSingleClassMinutes()));
 		}
-		applyBaseInfo.setEducationalTeacherId(sysUser.getId());
 		return practiceGroupService.createActivityPracticeGroup(practiceGroupApplyDto);
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/education/ActivityController.java

@@ -154,7 +154,6 @@ public class ActivityController extends BaseController {
         for (CourseSchedule courseSchedule : practiceGroupApplyDto.getCourseSchedules()) {
             courseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(), applyBaseInfo.getSingleClassMinutes()));
         }
-        applyBaseInfo.setEducationalTeacherId(sysUser.getId());
         return practiceGroupService.createActivityPracticeGroup(practiceGroupApplyDto);
     }