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

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -11,33 +12,43 @@ public class MusicGroup {
 	private String id;
 	
 	/** 乐团名称 */
+	@ApiModelProperty(value = "乐团名称",required = false)
 	private String name;
 	
 	/** 所属分部 */
+	@ApiModelProperty(value = "所属分部",required = false)
 	private Integer organId;
 	
 	/** 学校(合作单位) */
+	@ApiModelProperty(value = "学校(合作单位) ",required = false)
 	private Integer schoolId;
 	
 	/** 报名截止日期 */
+	@ApiModelProperty(value = "报名截止日期",required = false)
 	private java.util.Date applyExpireDate;
 	
 	/** 团长 */
+	@ApiModelProperty(value = "团长",required = false)
 	private Integer teamTeacherId;
 	
 	/** 教务老师 */
+	@ApiModelProperty(value = "教务老师",required = false)
 	private Integer educationalTeacherId;
 	
 	/** 收费类型 */
+	@ApiModelProperty(value = "乐团名称",required = false)
 	private Integer chargeTypeId;
 	
 	/** 课程组 */
+	@ApiModelProperty(value = "课程组",required = false)
 	private String courseGroupId;
 	
 	/**  */
+	@ApiModelProperty(value = "乐团课时数",required = false)
 	private Integer classPeriod;
 	
 	/**  */
+	@ApiModelProperty(value = "乐团赠送课时数",required = false)
 	private Integer freeClassPeriod;
 	
 	/**  */
@@ -47,12 +58,15 @@ public class MusicGroup {
 	private java.util.Date updateTime;
 	
 	/** 状态（报名中、缴费中、筹备中、进行中、取消） */
+	@ApiModelProperty(value = "乐团状态（报名中、缴费中、筹备中、进行中、取消）",required = false)
 	private String status;
 	
 	/** 缴费截止日期 */
+	@ApiModelProperty(value = "乐团缴费截止日期",required = false)
 	private java.util.Date paymentExpireDate;
 	
 	/** 计费开始日期 */
+	@ApiModelProperty(value = "乐团计费开始日期 ",required = false)
 	private java.util.Date billStartDate;
 	
 	public void setId(String id){