Merge remote-tracking branch 'origin/ywx' into wn

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolController.java

@@ -105,7 +105,7 @@ public class SchoolController {
             return new ResultVo(0, "学年升级成功", histories);
         } catch (Exception e) {
             log.error("学年升级失败：" + e.getMessage());
-            return new ResultVo(1, "学年升级失败", e.getMessage());
+            return new ResultVo(1, e.getMessage());
         }
     }
 
@@ -121,7 +121,7 @@ public class SchoolController {
             return new ResultVo(0,"学年降级成功", histories);
         } catch (Exception e) {
             log.error("学年降级失败：" + e.getMessage());
-            return new ResultVo(1, "学年降级失败", e.getMessage());
+            return new ResultVo(1, e.getMessage());
         }
     }