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

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

@@ -12,10 +12,6 @@ public class SubjectGoodsMapper {
 	private Long id;
 	
 	/**  */
-	@ApiModelProperty(value = "乐团编号",required = false)
-	private Integer musicGroupId;
-	
-	/**  */
 	@ApiModelProperty(value = "科目编号",required = false)
 	private String subjectId;
 	
@@ -37,14 +33,6 @@ public class SubjectGoodsMapper {
 		return this.id;
 	}
 			
-	public void setMusicGroupId(Integer musicGroupId){
-		this.musicGroupId = musicGroupId;
-	}
-	
-	public Integer getMusicGroupId(){
-		return this.musicGroupId;
-	}
-			
 	public void setSubjectId(String subjectId){
 		this.subjectId = subjectId;
 	}

mec-web/src/main/resources/config/mybatis/SubjectGoodsMapperMapper.xml

@@ -8,7 +8,6 @@
 
     <resultMap type="com.ym.mec.web.dal.entity.SubjectGoodsMapper" id="SubjectGoodsMapper">
         <result column="id_" property="id"/>
-        <result column="music_group_id_" property="musicGroupId"/>
         <result column="subject_id_" property="subjectId"/>
         <result column="goods_id_" property="goodsId"/>
         <result column="create_time_" property="createTime"/>
@@ -33,8 +32,8 @@
         SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
         </selectKey>
         -->
-        INSERT INTO subject_plan_goods_mapper (id_,music_group_id_,subject_id_,goods_id_,create_time_,update_time_)
-        VALUES(#{id},#{musicGroupId},#{subjectId},#{goodsId},#{createTime},#{updateTime})
+        INSERT INTO subject_plan_goods_mapper (id_,subject_id_,goods_id_,create_time_,update_time_)
+        VALUES(#{id},#{subjectId},#{goodsId},#{createTime},#{updateTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -47,9 +46,6 @@
             <if test="updateTime != null">
                 update_time_ = #{updateTime},
             </if>
-            <if test="musicGroupId != null">
-                music_group_id_ = #{musicGroupId},
-            </if>
             <if test="goodsId != null">
                 goods_id_ = #{goodsId},
             </if>