Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -347,7 +347,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         student.setCurrentClass(studentRegistration.getCurrentClass());
         studentDao.update(student);
 
-        webFeignService.updateNickName(sysUser.getId(),studentRegistration.getName(),"STUDENT");
+        //webFeignService.updateNickName(sysUser.getId(),studentRegistration.getName(),"STUDENT");
         // 增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(), 1);
         // 报名成功后，发送短信

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

@@ -13,7 +13,7 @@
         <result column="status_" property="status"/>
         <result column="start_time_" property="startTime"/>
         <result column="end_time_" property="endTime"/>
-        <result column="order_id_" property="organId"/>
+        <result column="order_id_" property="orderId"/>
         <result column="change_order_id_" property="changeOrderId"/>
         <result column="operation_" property="operation"/>
         <result column="create_time_" property="createTime"/>

mec-web/src/main/java/com/ym/mec/web/controller/StudentInstrumentController.java

@@ -114,13 +114,6 @@ public class StudentInstrumentController extends BaseController {
         if (studentInstrument.getStudentId() == null) {
             return failed("学生id不能为空");
         }
-        if (studentInstrument.getStartTime() != null) {
-            studentInstrument.setStartTime(DateUtil.trunc(studentInstrument.getStartTime()));
-        }
-
-        if (studentInstrument.getEndTime() != null) {
-            studentInstrument.setEndTime(DateUtil.getLastTimeWithDay(studentInstrument.getEndTime()));
-        }
         studentInstrument.setOperation(sysUser.getId());
         SysUser student = sysUserFeignService.queryUserById(studentInstrument.getStudentId());
         studentInstrument.setOrganId(student.getOrganId());