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

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">

src/main/java/com/nis/web/service/basics/SysDictInfoService.java

@@ -111,6 +111,7 @@ public class SysDictInfoService extends BaseService{
     	  sysDictInfo.setCreateTime(new Date());
     	  sysDictInfo.setSysDictEditor(user);
     	  sysDictInfo.setEditTime(sysDictInfo.getCreateTime());
+    	  sysDictInfo.setIsInitianlize(0);//是否为初始化数据，默认为0：否
     	  sysDictInfoDao.insertDict(sysDictInfo);
     	  
 		}