解决更新冲突

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

@@ -1,6 +1,7 @@
 package com.ym.mec.web.dal.entity;
 
 import com.ym.mec.web.dal.enums.CourseStatusEnum;
+import com.ym.mec.web.dal.enums.TeachModeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 

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

@@ -1,11 +1,10 @@
 package com.ym.mec.web.dal.entity;
 
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import java.util.Date;
+
 /**
  * 对应数据库表(vip_group):
  */
@@ -14,6 +13,9 @@ public class VipGroup {
 	/**  */
 	private Long id;
 
+	@ApiModelProperty(value = "课程名称",required = false)
+	private String name;
+
 	/**  */
 	@ApiModelProperty(value = "用户编号", required = false)
 	private Integer userId;
@@ -51,6 +53,14 @@ public class VipGroup {
 	@ApiModelProperty(value = "线下课课时数", required = false)
 	private Integer offlineClassesNum;
 
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	public void setId(Long id) {
 		this.id = id;
 	}