From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/dto/jd/JDSearchFilter.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/jd/JDSearchFilter.java b/fanli/src/main/java/com/yeshi/fanli/dto/jd/JDSearchFilter.java
index cc5f875..856c806 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/jd/JDSearchFilter.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/jd/JDSearchFilter.java
@@ -1,9 +1,58 @@
 package com.yeshi.fanli.dto.jd;
 
 public class JDSearchFilter {
+	private String key;// 鍏抽敭瀛�
 	Integer isZY;// 鏄惁涓鸿嚜钀� 1-鑷惀
 	Integer hasCoupon;// 鏄惁鏈夊埜 1-鏈夊埜
 	Integer categoryId;// 鍒嗙被ID
 	int pageNo;// 椤电爜
 	int pageSize;// 姣忛〉鐨勬暟閲�
+
+	public Integer getIsZY() {
+		return isZY;
+	}
+
+	public void setIsZY(Integer isZY) {
+		this.isZY = isZY;
+	}
+
+	public Integer getHasCoupon() {
+		return hasCoupon;
+	}
+
+	public void setHasCoupon(Integer hasCoupon) {
+		this.hasCoupon = hasCoupon;
+	}
+
+	public Integer getCategoryId() {
+		return categoryId;
+	}
+
+	public void setCategoryId(Integer categoryId) {
+		this.categoryId = categoryId;
+	}
+
+	public int getPageNo() {
+		return pageNo;
+	}
+
+	public void setPageNo(int pageNo) {
+		this.pageNo = pageNo;
+	}
+
+	public int getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
 }

--
Gitblit v1.8.0