Merge branch 'goods_organ' of http://git.dayaedu.com/yonge/mec

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

@@ -180,6 +180,17 @@ public class MusicGroup {
 
 	private Boolean hasVerifyMusicalList = false;
 
+	//0云教练1云教练+
+	private Integer cloudTeacherType;
+
+	public Integer getCloudTeacherType() {
+		return cloudTeacherType;
+	}
+
+	public void setCloudTeacherType(Integer cloudTeacherType) {
+		this.cloudTeacherType = cloudTeacherType;
+	}
+
 	@ApiModelProperty(value = "进行中,缴费按钮控制",required = true)
 	private Boolean isRemedy = false;
 

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

@@ -100,21 +100,11 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Goods">
         UPDATE goods
         <set>
-            <if test="studentShowOrganId != null">
                 student_show_organ_id_ = #{studentShowOrganId},
-            </if>
-            <if test="educationShowOrganId != null">
                 education_show_organ_id_ = #{educationShowOrganId},
-            </if>
-            <if test="replacementShowOrganId != null">
                 replacement_show_organ_id_ = #{replacementShowOrganId},
-            </if>
-            <if test="courseFeeShowOrganId != null">
                 course_fee_show_organ_id_ = #{courseFeeShowOrganId},
-            </if>
-            <if test="memberFeeShowOrganId != null">
                 member_fee_show_organ_id_ = #{memberFeeShowOrganId},
-            </if>
             <if test="agreeCostPrice != null">
                 agree_cost_price_ = #{agreeCostPrice},
             </if>

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

@@ -40,6 +40,7 @@
         <result column="payment_valid_end_date_" property="paymentValidEndDate"/>
         <result column="payment_pattern_" property="paymentPattern"/>
         <result column="is_classroom_lessons_" property="isClassroomLessons"/>
+        <result column="cloud_teacher_type_" property="cloudTeacherType"/>
         <result column="course_view_type_" property="courseViewType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>