Merge branch 'master' of https://gitee.com/zouxuan/mec

mec-common/common-core/src/main/java/com/ym/mec/common/config/EnumConverter.java

@@ -20,7 +20,7 @@ public class EnumConverter<T extends BaseEnum<?, ?>> implements Converter<String
 	private T getEnum(Class<T> targerType, String source) {
 		for (T en : targerType.getEnumConstants()) {
 			if (en.getCode() instanceof Integer) {
-				if ((int) en.getCode() == Integer.parseInt(source.toString())) {
+				if ((Integer) en.getCode() == Integer.parseInt(source)) {
 					return en;
 				}
 			} else {

mec-web/src/main/java/com/ym/mec/web/controller/SchoolController.java

@@ -45,7 +45,7 @@ public class SchoolController extends BaseController {
     }
 
     @ApiOperation(value = "根据学校编号查询学校")
-    @DeleteMapping("/get/{id}")
+    @GetMapping("/get/{id}")
     public Object update(@ApiParam(value = "学校编号", required = true) @PathVariable("id") Integer id){
         return succeed(schoolService.get(id));
     }

mec-web/src/main/java/com/ym/mec/web/dal/enums/MusicGroupStatusEnum.java

@@ -4,11 +4,11 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum  MusicGroupStatusEnum implements BaseEnum<String,MusicGroupStatusEnum> {
 
-    APPLY("0","报名中"),
-    PAY("1","缴费中"),
-    PREPARE("2","筹备中"),
-    UNDERWAY("3","进行中"),
-    CANCEL("9","取消");
+    APPLY("APPLY","报名中"),
+    PAY("PAY","缴费中"),
+    PREPARE("PREPARE","筹备中"),
+    UNDERWAY("UNDERWAY","进行中"),
+    CANCEL("CANCEL","取消");
 
     private String code;
     private String msg;