Merge remote-tracking branch 'origin/pre' into pre

src/main/java/com/xjrsoft/module/student/mapper/BaseStudentSchoolRollMapper.java

@@ -53,7 +53,7 @@ public interface BaseStudentSchoolRollMapper extends MPJBaseMapper<BaseStudentSc
     Boolean updateStudentClass1(@Param("classId") Long classId, @Param("majorSetId") Long majorSetId, @Param("userId") Long userId);
 
     @Update("UPDATE base_student_school_roll SET class_id = #{classId} where user_id = #{userId}")
-    Boolean updateStudentClass(@Param("classId") Long classId, @Param("userId") Long userId);
+    Boolean updatestudentclassByClassIdAndUserId(@Param("classId") Long classId, @Param("userId") Long userId);
 
     @Update("UPDATE base_student_school_roll SET class_id = #{classId},major_set_id=#{majorSetId},grade_id=#{gradeId} where user_id = #{userId}")
     Boolean updateStudentClass(@Param("classId") Long classId, @Param("gradeId") Long gradeId, @Param("majorSetId") Long majorSetId, @Param("userId") Long userId);

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentSchoolRollServiceImpl.java

@@ -269,7 +269,7 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateStudentClass(Long classId, Long userId) {
-        return baseStudentSchoolRollMapper.updateStudentClass(classId, userId);
+        return baseStudentSchoolRollMapper.updatestudentclassByClassIdAndUserId(classId, userId);
     }
 
     @Override