From def67816e02df9da765751bed2a2ddf0e0efaf5d Mon Sep 17 00:00:00 2001
From: zhangdaihao <zhangdaiscott@163.com>
Date: Wed, 24 Jan 2018 18:04:03 +0800
Subject: [PATCH] =?UTF-8?q?JEECG=203.7.2=E7=89=88=E6=9C=AC=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=20-=20=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E6=94=B9?=
 =?UTF-8?q?=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                               | 1 -
 src/main/java/org/jeecgframework/tag/ftl/superquery.ftl | 4 ++--
 src/main/resources/dbconfig.properties                  | 6 +++---
 src/main/resources/jeecg/jeecg_database.properties      | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 0635eb8e..6ad8e87b 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,6 @@ JEECG 
 * 	¹Ù·½ÂÛ̳£º [http://www.jeecg.org](http://www.jeecg.org)
 * 	¹Ù·½ÍøÕ¾£º [http://www.guojusoft.com](http://www.guojusoft.com)
 * 	¹Ù·½²©¿Í£º [http://blog.csdn.net/zhangdaiscott](http://blog.csdn.net/zhangdaiscott)
-* 	¼¼ÊõÖ§³Ö£º [JEECGÉçÇø¹Ù·½Ö§³ÖQQȺ»ã×Ü](http://www.jeecg.org/forum.php?mod=viewthread&tid=1249&extra=page%3D1)
 
 
 
diff --git a/src/main/java/org/jeecgframework/tag/ftl/superquery.ftl b/src/main/java/org/jeecgframework/tag/ftl/superquery.ftl
index bd339cc8..c3988f27 100644
--- a/src/main/java/org/jeecgframework/tag/ftl/superquery.ftl
+++ b/src/main/java/org/jeecgframework/tag/ftl/superquery.ftl
@@ -51,7 +51,7 @@
 								<#--update-begin--Author:xuelin  Date:20171108 for：[#2404]�平�UI改造】UI样�改造点--高级查询弹出窗��挡 -->
 								<#if '${column.hidden?string("true", "false")}' != "true">
 									<#--update-begin--Author:LiShaoQing  Date:20180110 for：[#2452]�新功能】高级查询，支�popup功能 -->
-									<option value="${column.field}" data-popup="${column.popup}" data-dictionary="${column.dictionary}">${column.title}</option>
+									<option value="${column.field}" data-popup="${column.popup?string}" data-dictionary="${column.dictionary!}">${column.title!}</option>
 									<#--update-end--Author:LiShaoQing  Date:20180110 for：[#2452]�新功能】高级查询，支�popup功能 -->
 								</#if>
 								<#--update-end--Author:xuelin  Date:20171108 for：[#2404]�平�UI改造】UI样�改造点--高级查询弹出窗��挡 -->
@@ -106,7 +106,7 @@
 							<#list fields as column>
 							<#--update-begin--Author:xuelin  Date:20171108 for：[#2404]�平�UI改造】UI样�改造点--高级查询弹出窗��挡 -->
 								<#if '${column.hidden?string("true", "false")}' != "true">
-									<option value="${column.field}" data-popup="${column.popup}" data-dictionary="${column.dictionary}">${column.title}</option>
+									<option value="${column.field}" data-popup="${column.popup?string}" data-dictionary="${column.dictionary!}">${column.title!}</option>
 								</#if>
 							<#--update-end--Author:xuelin  Date:20171108 for：[#2404]�平�UI改造】UI样�改造点--高级查询弹出窗��挡 -->
 							</#list>
diff --git a/src/main/resources/dbconfig.properties b/src/main/resources/dbconfig.properties
index cc7af76d..b71daecd 100644
--- a/src/main/resources/dbconfig.properties
+++ b/src/main/resources/dbconfig.properties
@@ -18,9 +18,9 @@
 #MySQL
 hibernate.dialect=org.hibernate.dialect.MySQLDialect
 validationQuery.sqlserver=SELECT 1
-jdbc.url.jeecg=jdbc:mysql://192.168.1.199:3306/jeecg_3.7.2?useUnicode=true&characterEncoding=UTF-8
-jdbc.username.jeecg=guoju
-jdbc.password.jeecg=guoju123123
+jdbc.url.jeecg=jdbc:mysql://localhost:3306/jeecg?useUnicode=true&characterEncoding=UTF-8
+jdbc.username.jeecg=root
+jdbc.password.jeecg=root
 jdbc.dbType=mysql
 
 #Oracle
diff --git a/src/main/resources/jeecg/jeecg_database.properties b/src/main/resources/jeecg/jeecg_database.properties
index 02abfdb1..d4a15d6a 100644
--- a/src/main/resources/jeecg/jeecg_database.properties
+++ b/src/main/resources/jeecg/jeecg_database.properties
@@ -1,9 +1,9 @@
 #mysql 
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://192.168.1.199:3306/jeecg_3.7.2?useUnicode=true&characterEncoding=UTF-8
-username=guoju
-password=guoju123123
-database_name=jeecg_3.7.2
+url=jdbc:mysql://localhost:3306/jeecg?useUnicode=true&characterEncoding=UTF-8
+username=root
+password=root
+database_name=jeecg
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver