Merge remote-tracking branch 'origin/master'

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

@@ -905,6 +905,7 @@
         <result column="is_super_admin_" property="isSuperAdmin"/>
         <result column="current_grade_" property="currentGrade"/>
         <result column="current_class_" property="currentClass"/>
+        <result column="certificate_type_" property="certificateType" />
     </resultMap>
 
     <select id="getUser" resultMap="SysUser">