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

2018-04-08 11:11:05 +08:00
parent aaa5c8ba87 b8fbd975c6
commit 2ed9333e69
8 changed files with 172 additions and 47 deletions
--- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
@@ -43,7 +43,8 @@
 		s.creator_id AS "sysDictCreator.id",
 		s.create_time AS createTime,
 		s.editor_id AS "sysDictEditor.id",
-		s.edit_time AS editTime
+		s.edit_time AS editTime,
+		s.is_initianlize AS isInitianlize
 	</sql>
 	
 	   	<sql id="menuJoins">