Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education

# Conflicts:
#	src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

@@ -180,7 +180,7 @@ public enum ResultServiceEnums {
 
     EXISE_ROOM_CODE(96,"此教室编号已存在，添加失败"),
 
-    CURRENT_TERM(96,"当前学期不可删除"),
+    CURRENT_TERM(97,"当前学期不可删除"),
     ;
 
     private Integer code;