Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-student/src/main/java/com/ym/mec/student/controller/StudentCompetitionController.java

@@ -44,7 +44,7 @@ public class StudentCompetitionController extends BaseController {
         if (sysUser == null) {
             return failed("请登录");
         }
-        contractService.register(studentCompetition.getUserId(), studentCompetition.getUsername(), studentCompetition.getIdCardNo(),sysUser.getPhone());
+        contractService.register(sysUser.getId(), studentCompetition.getUsername(), studentCompetition.getIdCardNo(),sysUser.getPhone());
         studentCompetition.setUserId(sysUser.getId());
         studentCompetitionService.addStudentCompetition(studentCompetition);
         return succeed();