Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -128,9 +128,6 @@
             <if test="realName != null">
                 real_name_ = #{realName},
             </if>
-            <if test="isSuperAdmin != null">
-                is_super_admin_ = #{isSuperAdmin},
-            </if>
         </set>
         WHERE id_ = #{id}
     </update>

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/entity/ExamRoom.java

@@ -9,7 +9,7 @@ import java.util.Date;
 /**
  * 对应数据库表(exam_room):
  */
-public class ExamRoom {
+public class ExamRoom{
 
 	private Long id;