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

src/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -76,6 +76,7 @@
         t7.name, t8.name, t2.gender, t10.sex, t2.birth_date, t2.avatar, t6.name,
         t12.name, t13.name, t11.name,t3.stduy_status,t3.archives_status,t3.roll_modality
     </select>
+
     <select id="getInfoById" resultType="com.xjrsoft.module.student.vo.BaseStudentInfoDetailVo">
         SELECT t2.id,
                t2.name                                                                                                       AS student_name,