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

src/main/java/com/xjrsoft/module/student/vo/BaseStudentInfoDetailVo.java

@@ -120,4 +120,7 @@ public class BaseStudentInfoDetailVo {
 
     @ApiModelProperty("学生类别")
     private String studentForm;
+
+    @ApiModelProperty("学籍号")
+    private String rollNumber;
 }

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

@@ -26,6 +26,7 @@
             t3.archives_status AS archivesStatusCode,
             t3.stduy_status AS stduyStatusCode,
             t3.roll_modality AS rollModalityCode,
+            t3.roll_number AS rollNumber,
             t12.name AS archives_status,
             t8.name AS stduy_status,
             t13.name AS roll_modality,
@@ -97,6 +98,7 @@
                t3.archives_status                                                                                            as archivesStatusCode,
                t3.stduy_status                                                                                               as stduyStatusCode,
                t3.roll_modality                                                                                              as rollModalityCode,
+               t3.roll_number AS rollNumber,
                 t12.name AS student_form,
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010604%' AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS jxf,
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode = 103042766003001 AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS ssf,