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

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/GradeServiceImpl.java

@@ -64,7 +64,7 @@ public class GradeServiceImpl implements GradeService{
                         classNode.setId(class_.getClazz_id());
                         classNode.setLeaf(true);
                         classNode.setText(class_.getClazz_name());
-                        classNode.setType(SCHOOLTYPE.CALSS.name());
+                        classNode.setType(SCHOOLTYPE.CLASS.name());
                         classesTree.add(classNode);
                     }
                 }