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

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1309,8 +1309,12 @@ public class ExportController extends BaseController {
                 }
                 if (row.getStudentStatus().equals("NORMAL")) {
                     row.setStudentStatus("在读");
-                } else {
+                } else if (row.getStudentStatus().equals("QUIT")) {
                     row.setStudentStatus("退团");
+                } else if (row.getStudentStatus().equals("APPLY")) {
+                    row.setStudentStatus("报名");
+                } else {
+                    row.setStudentStatus("" + row.getStudentStatus());
                 }
                 if (row.getIsActive()) {
                     row.setActiveName("是");