Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-2/examcloud-core-basic.git

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/service/core/api/AuthController.java

@@ -53,7 +53,7 @@ public class AuthController extends ControllerSupport {
 		if (StringUtils.isBlank(key)) {
 			throw new StatusException("P-001009", "key is blank");
 		}
-		if (StringUtils.isBlank(key)) {
+		if (StringUtils.isBlank(token)) {
 			throw new StatusException("P-001010", "token is blank");
 		}
 

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Org.java

@@ -87,7 +87,6 @@ public class Org implements Serializable{
     /**
      * 机构类型：学校，启明，印刷
      */
-    @NotNull
     @Enumerated(EnumType.STRING)
     private OrgType type;