Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

2018-03-12 15:51:39 +08:00
parent b9c403ff40 d842c773ec
commit 5d4a1d5c96
20 changed files with 578 additions and 256 deletions
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -5,7 +5,7 @@ adminPath=/nis
 servicePath=/service

 #\u5206\u9875\u914d\u7f6e
-page.pageSize=5
+page.pageSize=20
 #\u5206\u9875\u914d\u7f6e
 page.count=0

@@ -235,5 +235,7 @@ jdbc.hive.AName=xa_dfbhit_hive
 jdbc.hive.BName=xa_z2_mesalog_hive

 maxPageSize=100000
-
-maxLevelNo=4
+#允许配置最大层级
+maxLevelNo=4
+#上下级显示间隔标识符
+childrenMark=.