Merge branch 'saas' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -210,7 +210,7 @@ public class MusicGroup extends BaseEntity {
 	private Integer musicGroupPlanMakingId;
 	
 	@ApiModelProperty(value = "成团年级",required = false)
-	private Integer firstRecruitGrade;
+	private String firstRecruitGrade;
 	
 	@ApiModelProperty(value = "默认收费标准",required = false)
 	private BigDecimal defaultChargeStandard;
@@ -750,11 +750,11 @@ public class MusicGroup extends BaseEntity {
 		this.musicGroupPlanMakingId = musicGroupPlanMakingId;
 	}
 
-	public Integer getFirstRecruitGrade() {
+	public String getFirstRecruitGrade() {
 		return firstRecruitGrade;
 	}
 
-	public void setFirstRecruitGrade(Integer firstRecruitGrade) {
+	public void setFirstRecruitGrade(String firstRecruitGrade) {
 		this.firstRecruitGrade = firstRecruitGrade;
 	}