Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/page/GoodsSellQueryInfo.java

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.dal.page;
 
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -13,7 +12,7 @@ public class GoodsSellQueryInfo extends QueryInfo {
 	private Integer studentId;
 
 	@ApiModelProperty(value = "交易状态",required = true)
-	private DealStatusEnum status;
+	private String status;
 
 	public Integer getTeacherId() {
 		return teacherId;
@@ -31,11 +30,11 @@ public class GoodsSellQueryInfo extends QueryInfo {
 		this.studentId = studentId;
 	}
 
-	public DealStatusEnum getStatus() {
+	public String getStatus() {
 		return status;
 	}
 
-	public void setStatus(DealStatusEnum status) {
+	public void setStatus(String status) {
 		this.status = status;
 	}
 }