update

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

@@ -22,8 +22,8 @@ public class ActivityPlan {
 	@ApiModelProperty(value = "活动描述")
 	private String description;
 
-	@ApiModelProperty(value = "活动类型，课程或者会员")
-	private String type;
+	@ApiModelProperty(value = "活动类型，课程或者会员,0课程，1会员")
+	private Integer type;
 
 	@ApiModelProperty(value = "活动开始时间")
 	private java.util.Date startTime;
@@ -129,11 +129,11 @@ public class ActivityPlan {
 		this.description = description;
 	}
 
-	public String getType() {
+	public Integer getType() {
 		return type;
 	}
 
-	public void setType(String type) {
+	public void setType(Integer type) {
 		this.type = type;
 	}
 

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -50,11 +50,6 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.VipGroupActivity" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
 		INSERT INTO vip_group_activity (id_,name_,description_,vip_group_category_id_list_,start_time_,end_time_,organ_id_,courses_start_time_,courses_end_time_,type_,
 		                                attribute1_,attribute2_,attribute3_,salary_readonly_flag_,give_class_pay_salary_flag_,create_time_,update_time_,salary_settlement_json_,del_flag_,
 		                                payment_readonly_flag_,online_class_join_gradient_rewards_,offline_class_join_gradient_rewards_,min_course_num_,max_course_num_,