add 商品列表搜索加上，是否乐器置换搜索

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

@@ -44,6 +44,9 @@ public class ReplacementInstrumentActivity {
 	
 	/** 乐器编号 */
 	private Integer instrumentsId;
+
+	/** 商品编号 */
+	private Integer goodsId;
 	
 	private String otherSuggestion;
 
@@ -190,11 +193,6 @@ public class ReplacementInstrumentActivity {
 		this.payStatus = payStatus;
 	}
 
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
 	public YesOrNoEnum getShowQuestion() {
 		return showQuestion;
 	}
@@ -202,4 +200,17 @@ public class ReplacementInstrumentActivity {
 	public void setShowQuestion(YesOrNoEnum showQuestion) {
 		this.showQuestion = showQuestion;
 	}
+
+	public Integer getGoodsId() {
+		return goodsId;
+	}
+
+	public void setGoodsId(Integer goodsId) {
+		this.goodsId = goodsId;
+	}
+
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
 }