Merge branch 'V2.0.3' of ssh://103.249.252.28:10022/lcy/education

# Conflicts:
#	src/main/java/org/rcisoft/business/barrange/dao/BArrangeRepository.java
#	src/main/java/org/rcisoft/business/barrange/entity/BArrange.java
#	src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java
#	src/main/resources/mapper/business/barrange/mapper/BArrangeMapper.xml

src/main/java/org/rcisoft/business/bstudent/entity/BStudent.java

@@ -23,7 +23,6 @@ import java.util.Date;
 public class BStudent extends IdEntity<BStudent> {
     private static final long serialVersionUID = 2375118311059668811L;
 
-
     public BStudent(String code) {
         this.code = code;
     }
@@ -56,8 +55,7 @@ public class BStudent extends IdEntity<BStudent> {
     private String recommendCourse;
 
     /*年级*/
-    @Length(min = 1,max = 64,message = "长度最小为1,最大为15")
-    @NotBlank
+    @Length(min = 1,max = 64,message = "长度最小为1,最大为64")
     private String gradeCode;
 
     @Length(min = 1,max = 15,message = "长度最小为1,最大为15")