From 9ae4d9301f6334a77d18372a9427e7e643a058db Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 25 May 2019 09:57:38 +0800
Subject: [PATCH] =?UTF-8?q?select=E4=B8=8B=E6=8B=89=E6=A1=86option?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AD=97=E5=85=B8=E4=B8=AD=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E9=A2=9C=E8=89=B2=E5=92=8C=E6=A0=B7=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/src/main/resources/config/jeesite-core.yml        | 1 -
 .../core/src/main/resources/templates/modules/gen/config.xml   | 1 +
 web/src/main/resources/config/application.yml                  | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 13b600e8..713d69a9 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -115,7 +115,6 @@ user:
       "employee":{"dao":"employeeDao","loginView":"","indexView":"modules/sys/sysIndex"},
       "member":{"dao":"memberDao","loginView":"","indexView":"modules/sys/sysIndexMember"},
       "btype":{"dao":"btypeInfoDao","loginView":"","indexView":"modules/sys/sysIndexBtype"},
-      "persion":{"dao":"persionDao","loginView":"","indexView":"modules/sys/sysIndexPersion"},
       "expert":{"dao":"expertDao","loginView":"","indexView":"modules/sys/sysIndexExpert"}
     }
 
diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml
index 2f8a6b0e..3e481b25 100644
--- a/modules/core/src/main/resources/templates/modules/gen/config.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) 2013-Now http://jeesite.com All rights reserved. -->
+<!-- 该文件可自定义，复制 config.xml 到  config-custom.xml 相同目录下，即可生效。 -->
 <config>
 	<!-- 模板分类 -->
 	<tplCategory>
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 9a69f22e..4184a3b6 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -102,7 +102,7 @@ jdbc:
 #    removeAbandoned: true
 #    removeAbandonedTimeout: 2100
 
-#  # 多数据源名称列表，启用方式：@MyBatisDao(dataSourceName="ds2")
+#  # 多数据源名称列表，多个用逗号隔开，使用方法：@MyBatisDao(dataSourceName="ds2")
 #  dataSourceNames: ds2
 #  
 #  # 多数据源配置：ds2
@@ -215,7 +215,6 @@ logging:
 #      "employee":{"dao":"employeeDao","loginView":"","indexView":"modules/sys/sysIndex"},
 #      "member":{"dao":"memberDao","loginView":"","indexView":"modules/sys/sysIndexMember"},
 #      "btype":{"dao":"btypeInfoDao","loginView":"","indexView":"modules/sys/sysIndexBtype"},
-#      "persion":{"dao":"persionDao","loginView":"","indexView":"modules/sys/sysIndexPersion"},
 #      "expert":{"dao":"expertDao","loginView":"","indexView":"modules/sys/sysIndexExpert"}
 #    }
 #