From caf65a0996d2aba4408926b968b3b097144e3b8b Mon Sep 17 00:00:00 2001
From: wu ming <569287825@qq.com>
Date: Fri, 23 Sep 2016 09:21:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=86=B7=E7=83=AD=E5=88=86=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/config/config.properties | 2 +-
 src/com/platform/entities/PagerOptions.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebContent/WEB-INF/config/config.properties b/WebContent/WEB-INF/config/config.properties
index 86b6b49e..b48ab162 100644
--- a/WebContent/WEB-INF/config/config.properties
+++ b/WebContent/WEB-INF/config/config.properties
@@ -4,7 +4,7 @@
 # 驱动程序
 jdbc.mysql.driver=com.mysql.jdbc.Driver
 # 连接url
-jdbc.mysql.url=jdbc:mysql://192.168.0.110:3306/ftpdata?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 # 用户名
 jdbc.mysql.username=root
 # 密码
diff --git a/src/com/platform/entities/PagerOptions.java b/src/com/platform/entities/PagerOptions.java
index 55955db7..39a68d35 100644
--- a/src/com/platform/entities/PagerOptions.java
+++ b/src/com/platform/entities/PagerOptions.java
@@ -30,7 +30,7 @@ public class PagerOptions {
 	//模糊查询字段
 	private String[] array;
 	
-	private int volumeType;
+	private String volumeType;
 	//冷热区字段
 	private String mark;
 	
@@ -161,14 +161,14 @@ public class PagerOptions {
 	/**
 	 * @return the volumeType
 	 */
-	public int getVolumeType() {
+	public String getVolumeType() {
 		return volumeType;
 	}
 
 	/**
 	 * @param volumeType the volumeType to set
 	 */
-	public void setVolumeType(int volumeType) {
+	public void setVolumeType(String volumeType) {
 		this.volumeType = volumeType;
 	}
 

From 564b286856755b51ba20c51f4d673de60e3b9d56 Mon Sep 17 00:00:00 2001
From: wu ming <569287825@qq.com>
Date: Sat, 8 Oct 2016 08:59:27 +0800
Subject: [PATCH 2/3] --nonthing

---
 WebContent/WEB-INF/config/config.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebContent/WEB-INF/config/config.properties b/WebContent/WEB-INF/config/config.properties
index b48ab162..ead793d5 100644
--- a/WebContent/WEB-INF/config/config.properties
+++ b/WebContent/WEB-INF/config/config.properties
@@ -4,7 +4,7 @@
 # 驱动程序
 jdbc.mysql.driver=com.mysql.jdbc.Driver
 # 连接url
-jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc.mysql.url=jdbc:mysql://192.168.0.102:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 # 用户名
 jdbc.mysql.username=root
 # 密码

From 87c1b7ab1500d5589cada6d5fe365731fa167a65 Mon Sep 17 00:00:00 2001
From: wu ming <569287825@qq.com>
Date: Wed, 19 Oct 2016 08:43:13 +0800
Subject: [PATCH 3/3] --nothing

---
 WebContent/WEB-INF/config/config.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebContent/WEB-INF/config/config.properties b/WebContent/WEB-INF/config/config.properties
index 65bc7518..b288b318 100644
--- a/WebContent/WEB-INF/config/config.properties
+++ b/WebContent/WEB-INF/config/config.properties
@@ -4,7 +4,7 @@
 # 驱动程序
 jdbc.mysql.driver=com.mysql.jdbc.Driver
 # 连接url
-jdbc.mysql.url=jdbc:mysql://192.168.0.102:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+jdbc.mysql.url=jdbc:mysql://192.168.0.101:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
 # 用户名
 jdbc.mysql.username=root
 # 密码