Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mec-web/src/main/java/com/ym/mec/web/dal/enums/StudentAttendanceStatusEnum.java

mec-common/common-core/src/main/java/com/ym/mec/common/controller/BaseController.java

@@ -24,10 +24,6 @@ public class BaseController {
 		return getResponseData(true, HttpStatus.OK, null, "");
 	}
 
-	public static HttpResponseResult succeed(String message) {
-		return failed(HttpStatus.OK, message);
-	}
-
 	public static HttpResponseResult succeedData(Object obj) {
 		return getResponseData(true, HttpStatus.OK, obj, "操作成功");
 	}

mec-web/src/main/java/com/ym/mec/web/dal/entity/ClassGroup.java

@@ -44,7 +44,7 @@ public class ClassGroup {
 	private java.util.Date updateTime;
 	
 	/** 班级类型(普通班级、合奏班级) */
-	@ApiModelProperty(value = "班级类型(普通班级、合奏班级)",required = false)
+	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级)",required = false)
 	private ClassGroupTypeEnum type;
 	
 	/** 教师课酬 */

mec-web/src/main/java/com/ym/mec/web/dal/entity/StudentAttendance.java

@@ -37,7 +37,7 @@ public class StudentAttendance {
 	private Integer teacherId;
 	
 	/** 状态（正常、旷课、请假） */
-	@ApiModelProperty(value = "状态（正常、旷课、请假）",required = false)
+	@ApiModelProperty(value = "状态（正常、旷课、请假、休学）",required = false)
 	private StudentAttendanceStatusEnum status;
 	
 	/**  */

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

@@ -6,7 +6,7 @@ import com.ym.mec.common.enums.BaseEnum;
  * 班级类型(普通班级、合奏班级)
  */
 public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
-	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班");
+	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "小课");
 
 	private String code;
 

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

@@ -4,7 +4,7 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum GoodsType implements BaseEnum<String, GoodsType> {
 
-	INSTRUMENT("INSTRUMENT", "乐器"), ACCESSORIES("ACCESSORIES", "辅件"), MATERIAL("MATERIAL", "教材");
+	INSTRUMENT("INSTRUMENT", "乐器"), ACCESSORIES("ACCESSORIES", "教辅");
 
 	private String code;