diff --git a/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml
index 3c65caf02..44b88d8e3 100644
--- a/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml
@@ -50,8 +50,6 @@
 		s.edit_time AS editTime
 	</sql>
   
-  
-  
   <!-- 查询分类性质列表  -->
     <select id="findDictList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.SysDictInfo">
 	SELECT * FROM sys_dict_info WHERE  is_valid=1 
diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp
index b59199f0f..743cc5fb7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/pages/css/dictInfo.css" />
-	<title>生效范围配置管理</title>
+	<title>分类性质配置管理</title>
 	<script type="text/javascript">
 		$(document).ready(function() {
 			jQuery.validator.addMethod("codeNumber",function(value,element){
@@ -63,7 +63,7 @@
 		
 		
 	<h3 class="page-title">
-		生效范围配置管理 
+		分类性质配置管理 
 	</h3>
 
 	<div class="row">
@@ -71,7 +71,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i>分类性质配置<shiro:hasPermission name="sys:menu:edit">${not empty sysDictInfo.sysDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div>
+						<i class="fa fa-gift"></i>分类性质配置<shiro:hasPermission name="sys:menu:edit">${not empty serviceDictInfo.serviceDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse"> </a>
 						<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -86,8 +86,8 @@
 					<div class="form-body">
 
 						<!-- BEGIN FORM-->	
-						<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/saveOrUpdate" method="post" class="form-horizontal">
-							<form:hidden path="sysDictId"/>
+						<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/saveOrUpdate" method="post" class="form-horizontal">
+							<form:hidden path="serviceDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
 								<label class="col-md-3 control-label">上级配置:</label>
@@ -98,20 +98,22 @@
 								
 								<div class="col-md-4">
 								<%-- <form:input path="parent.serviceDictId" htmlEscape="false" maxlength="50" class="form-control" disabled="disabled" readonly="readonly"/> --%>
-									 <form:input path="parent.sysDictId" htmlEscape="false" maxlength="50" class="form-control"/>
+									 <form:input path="parent.serviceDictId" htmlEscape="false" maxlength="50" class="form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
 								<div class="col-md-4">
 				                    <select id="itemType" name="itemType" class="form-control">
-					                    <c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
-					                          <c:if test="${dict.itemCode eq sysDictInfo.itemType}"> 
-					                         <option value="${sysDictInfo.itemType}" selected="selected">${dict.itemValue}</option>
+					                    <c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
+					                      <c:if test="${dict.itemCode ne '3'}">
+					                          <c:if test="${dict.itemCode eq serviceDictInfo.itemType}"> 
+					                         <option value="${serviceDictInfo.itemType}" selected="selected">${dict.itemValue}</option>
 					                         </c:if>
-					                        <c:if test="${dict.itemCode ne sysDictInfo.itemType}"> 
+					                        <c:if test="${dict.itemCode ne serviceDictInfo.itemType}"> 
 					                         <option value="${dict.itemCode}">${dict.itemValue}</option>
 					                         </c:if> 
+					                      </c:if> 
 					                    </c:forEach>
 				                    </select>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp
index b80f88be9..166eaa0a4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/pages/css/dictInfo.css" />
-	<title>生效范围配置管理</title>
+	<title>分类性质配置管理</title>
 </head>
 <body>
 
@@ -18,7 +18,7 @@
 		
 		
 	<h3 class="page-title">
-		生效范围配置管理 
+		分类性质配置管理 
 	</h3>
 
 	<div class="row">
@@ -26,7 +26,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i>生效范围配置查看</div>
+						<i class="fa fa-gift"></i>分类性质配置查看</div>
 				</div>
 				
 				<div class="portlet-body form">
@@ -35,43 +35,43 @@
 					<div class="form-body">
 
 						<!-- BEGIN FORM-->	
-						<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/saveOrUpdate" method="post" class="form-horizontal">
-							<form:hidden path="sysDictId"/>
+						<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/saveOrUpdate" method="post" class="form-horizontal">
+							<form:hidden path="serviceDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
 								<label class="col-md-3 control-label">上级配置:</label>
 								<div class="col-md-4">
-								  <input value="${sysDictInfo.parent.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${serviceDictInfo.parent.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
 							    </div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
 								<div class="col-md-4">
-								  <input value="${fns:getDictLabel('SYS_DICT_ITM_TYPE',sysDictInfo.itemType,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${fns:getDictLabel('SERVICE_DICT_ITM_TYPE',serviceDictInfo.itemType,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font>编码:</label>
 								<div class="col-md-4">
-								  <input value="${sysDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${serviceDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font>编码对应值:</label>
 								<div class="col-md-4">
-								  <input value="${sysDictInfo.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${serviceDictInfo.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font>是否叶子节点:</label>
 								<div class="col-md-4">
-								  <input value="${fns:getDictLabel('SYS_YES_NO',sysDictInfo.isValid,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${fns:getDictLabel('SYS_YES_NO',serviceDictInfo.isValid,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label">描述信息:</label>
 								<div class="col-md-4">
-								  <input value="${sysDictInfo.itemDesc}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${serviceDictInfo.itemDesc}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 						</form:form>
diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp
index 4b473a1ef..bb559abc9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp
@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-<title>生效范围配置信息</title>
+<title>分类性质配置信息</title>
 <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/pages/css/dictInfo.css" />
 <script>
  	$(document).ready(function() {
@@ -14,7 +14,7 @@
 
 		$("#pageNo").val(n);
 		$("#pageSize").val(s);
-		$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/list");
+		$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/list");
 		$("#searchForm").submit();
 		return false;
 	}
@@ -39,9 +39,9 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/sysDictInfo/list'"><spring:message code="refresh"></spring:message></button>
+		<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/serviceDictInfo/list'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/configuration/sysDictInfo/form'">新增</button>
+			onClick="javascript:window.location='${ctx}/configuration/serviceDictInfo/form'">新增</button>
 	</div>
 	
 	<div class="row">
@@ -49,23 +49,23 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="生效范围配置列表"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="分类性质配置列表"></spring:message>
 					</div>
 				</div>
 				<div class="portlet-body">
 
 					<div class="row"  >
-				<form:form id="searchForm" modelAttribute="requestInfo" action="${ctx}/configuration/sysDictInfo/list" method="post" class="form-search">
+				<form:form id="searchForm" modelAttribute="requestInfo" action="${ctx}/configuration/serviceDictInfo/list" method="post" class="form-search">
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<div class="col-md-12">
-							<label class="search-lable">编码：</label><input id="itemCode" name="itemCode" type="text" maxlength="50" class="input-medium" value="${sysDictInfo.itemCode}"/>
-			                <label class="search-lable">值：</label><input id="itemValue" name="itemValue" type="text" maxlength="50" class="input-medium" value="${sysDictInfo.itemValue}"/>
+							<label class="search-lable">编码：</label><input id="itemCode" name="itemCode" type="text" maxlength="50" class="input-medium" value="${serviceDictInfo.itemCode}"/>
+			                <label class="search-lable">值：</label><input id="itemValue" name="itemValue" type="text" maxlength="50" class="input-medium" value="${serviceDictInfo.itemValue}"/>
 
 			               <label class="search-lable">开始时间：</label><input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
-							value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+							value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 							<label class="search-lable">结束时间：</label><input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
-							value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+							value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 
 							<button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i> <spring:message code="search"></spring:message>
@@ -93,13 +93,13 @@
 								</tr>
 							</thead>
 							<tbody>
-							<c:forEach items="${page.list}" var="sysDictInfo">
+							<c:forEach items="${page.list}" var="serviceDictInfo">
 								<tr>
-									<td>${sysDictInfo.itemCode}</td>
-									<td>${sysDictInfo.itemValue}</td>
-									<td>${fns:abbr(sysDictInfo.itemDesc,15)}</td>
-									<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
-									<td><fmt:formatDate value="${sysDictInfo.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${serviceDictInfo.itemCode}</td>
+									<td>${serviceDictInfo.itemValue}</td>
+									<td>${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
+									<td>${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}</td>
+									<td><fmt:formatDate value="${serviceDictInfo.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<%-- <td>
 										<button class="btn revision popovers purple-stripe" data-content="${serviceDictInfo.itemDesc}">修改记录查看</button>
 									</td> --%>
@@ -109,15 +109,15 @@
 									      <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
 									      <ul class="dropdown-menu">
 									      
-								        	<li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0"><i class="icon-list"></i>查看</a></li>
+								        	<li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0"><i class="icon-list"></i>查看</a></li>
 								        	<li class="divider"></li>
 									       
 									        <shiro:hasPermission name="sys:dict:edit">
-										        <li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要修改吗？', this.href)"><i class="icon-edit"></i> 修改</a></li>
+										        <li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要修改吗？', this.href)"><i class="icon-edit"></i> 修改</a></li>
 										        <li class="divider"></li>
 									        </shiro:hasPermission>
 									        <shiro:hasPermission name="sys:dict:edit">
-									       	 	<li><a href="${ctx}/configuration/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要删除吗？', this.href)"><i class="icon-trash"></i> 删除</a></li>
+									       	 	<li><a href="${ctx}/configuration/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要删除吗？', this.href)"><i class="icon-trash"></i> 删除</a></li>
 											</shiro:hasPermission>
 									    
 									      </ul>
diff --git a/src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp
index 743cc5fb7..b59199f0f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/pages/css/dictInfo.css" />
-	<title>分类性质配置管理</title>
+	<title>生效范围配置管理</title>
 	<script type="text/javascript">
 		$(document).ready(function() {
 			jQuery.validator.addMethod("codeNumber",function(value,element){
@@ -63,7 +63,7 @@
 		
 		
 	<h3 class="page-title">
-		分类性质配置管理 
+		生效范围配置管理 
 	</h3>
 
 	<div class="row">
@@ -71,7 +71,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i>分类性质配置<shiro:hasPermission name="sys:menu:edit">${not empty serviceDictInfo.serviceDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div>
+						<i class="fa fa-gift"></i>分类性质配置<shiro:hasPermission name="sys:menu:edit">${not empty sysDictInfo.sysDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse"> </a>
 						<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -86,8 +86,8 @@
 					<div class="form-body">
 
 						<!-- BEGIN FORM-->	
-						<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/saveOrUpdate" method="post" class="form-horizontal">
-							<form:hidden path="serviceDictId"/>
+						<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/saveOrUpdate" method="post" class="form-horizontal">
+							<form:hidden path="sysDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
 								<label class="col-md-3 control-label">上级配置:</label>
@@ -98,22 +98,20 @@
 								
 								<div class="col-md-4">
 								<%-- <form:input path="parent.serviceDictId" htmlEscape="false" maxlength="50" class="form-control" disabled="disabled" readonly="readonly"/> --%>
-									 <form:input path="parent.serviceDictId" htmlEscape="false" maxlength="50" class="form-control"/>
+									 <form:input path="parent.sysDictId" htmlEscape="false" maxlength="50" class="form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
 								<div class="col-md-4">
 				                    <select id="itemType" name="itemType" class="form-control">
-					                    <c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
-					                      <c:if test="${dict.itemCode ne '3'}">
-					                          <c:if test="${dict.itemCode eq serviceDictInfo.itemType}"> 
-					                         <option value="${serviceDictInfo.itemType}" selected="selected">${dict.itemValue}</option>
+					                    <c:forEach items="${fns:getDictList('SYS_DICT_ITM_TYPE')}" var="dict">
+					                          <c:if test="${dict.itemCode eq sysDictInfo.itemType}"> 
+					                         <option value="${sysDictInfo.itemType}" selected="selected">${dict.itemValue}</option>
 					                         </c:if>
-					                        <c:if test="${dict.itemCode ne serviceDictInfo.itemType}"> 
+					                        <c:if test="${dict.itemCode ne sysDictInfo.itemType}"> 
 					                         <option value="${dict.itemCode}">${dict.itemValue}</option>
 					                         </c:if> 
-					                      </c:if> 
 					                    </c:forEach>
 				                    </select>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp b/src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp
index 166eaa0a4..b80f88be9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/pages/css/dictInfo.css" />
-	<title>分类性质配置管理</title>
+	<title>生效范围配置管理</title>
 </head>
 <body>
 
@@ -18,7 +18,7 @@
 		
 		
 	<h3 class="page-title">
-		分类性质配置管理 
+		生效范围配置管理 
 	</h3>
 
 	<div class="row">
@@ -26,7 +26,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i>分类性质配置查看</div>
+						<i class="fa fa-gift"></i>生效范围配置查看</div>
 				</div>
 				
 				<div class="portlet-body form">
@@ -35,43 +35,43 @@
 					<div class="form-body">
 
 						<!-- BEGIN FORM-->	
-						<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/configuration/serviceDictInfo/saveOrUpdate" method="post" class="form-horizontal">
-							<form:hidden path="serviceDictId"/>
+						<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/configuration/sysDictInfo/saveOrUpdate" method="post" class="form-horizontal">
+							<form:hidden path="sysDictId"/>
 							<sys:message content="${message}"/>
 							<div class="form-group">
 								<label class="col-md-3 control-label">上级配置:</label>
 								<div class="col-md-4">
-								  <input value="${serviceDictInfo.parent.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${sysDictInfo.parent.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
 							    </div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label radio-lable"><font color="red">*</font> 数据类型:</label>
 								<div class="col-md-4">
-								  <input value="${fns:getDictLabel('SERVICE_DICT_ITM_TYPE',serviceDictInfo.itemType,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${fns:getDictLabel('SYS_DICT_ITM_TYPE',sysDictInfo.itemType,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font>编码:</label>
 								<div class="col-md-4">
-								  <input value="${serviceDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${sysDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font>编码对应值:</label>
 								<div class="col-md-4">
-								  <input value="${serviceDictInfo.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${sysDictInfo.itemValue}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label"><font color="red">*</font>是否叶子节点:</label>
 								<div class="col-md-4">
-								  <input value="${fns:getDictLabel('SYS_YES_NO',serviceDictInfo.isValid,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${fns:getDictLabel('SYS_YES_NO',sysDictInfo.isValid,'0')}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-md-3 control-label">描述信息:</label>
 								<div class="col-md-4">
-								  <input value="${serviceDictInfo.itemDesc}" maxlength="50" class="form-control" readonly="readonly"/>
+								  <input value="${sysDictInfo.itemDesc}" maxlength="50" class="form-control" readonly="readonly"/>
 								</div>
 							</div>
 						</form:form>
diff --git a/src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp b/src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp
index bb559abc9..4b473a1ef 100644
--- a/src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp
@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-<title>分类性质配置信息</title>
+<title>生效范围配置信息</title>
 <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/static/pages/css/dictInfo.css" />
 <script>
  	$(document).ready(function() {
@@ -14,7 +14,7 @@
 
 		$("#pageNo").val(n);
 		$("#pageSize").val(s);
-		$("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/list");
+		$("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/list");
 		$("#searchForm").submit();
 		return false;
 	}
@@ -39,9 +39,9 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/serviceDictInfo/list'"><spring:message code="refresh"></spring:message></button>
+		<button type="button" class="btn btn-default" onclick="location='${ctx}/configuration/sysDictInfo/list'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/configuration/serviceDictInfo/form'">新增</button>
+			onClick="javascript:window.location='${ctx}/configuration/sysDictInfo/form'">新增</button>
 	</div>
 	
 	<div class="row">
@@ -49,23 +49,23 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="分类性质配置列表"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="生效范围配置列表"></spring:message>
 					</div>
 				</div>
 				<div class="portlet-body">
 
 					<div class="row"  >
-				<form:form id="searchForm" modelAttribute="requestInfo" action="${ctx}/configuration/serviceDictInfo/list" method="post" class="form-search">
+				<form:form id="searchForm" modelAttribute="requestInfo" action="${ctx}/configuration/sysDictInfo/list" method="post" class="form-search">
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<div class="col-md-12">
-							<label class="search-lable">编码：</label><input id="itemCode" name="itemCode" type="text" maxlength="50" class="input-medium" value="${serviceDictInfo.itemCode}"/>
-			                <label class="search-lable">值：</label><input id="itemValue" name="itemValue" type="text" maxlength="50" class="input-medium" value="${serviceDictInfo.itemValue}"/>
+							<label class="search-lable">编码：</label><input id="itemCode" name="itemCode" type="text" maxlength="50" class="input-medium" value="${sysDictInfo.itemCode}"/>
+			                <label class="search-lable">值：</label><input id="itemValue" name="itemValue" type="text" maxlength="50" class="input-medium" value="${sysDictInfo.itemValue}"/>
 
 			               <label class="search-lable">开始时间：</label><input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
-							value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+							value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 							<label class="search-lable">结束时间：</label><input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
-							value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+							value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 
 							<button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i> <spring:message code="search"></spring:message>
@@ -93,13 +93,13 @@
 								</tr>
 							</thead>
 							<tbody>
-							<c:forEach items="${page.list}" var="serviceDictInfo">
+							<c:forEach items="${page.list}" var="sysDictInfo">
 								<tr>
-									<td>${serviceDictInfo.itemCode}</td>
-									<td>${serviceDictInfo.itemValue}</td>
-									<td>${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
-									<td>${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}</td>
-									<td><fmt:formatDate value="${serviceDictInfo.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${sysDictInfo.itemCode}</td>
+									<td>${sysDictInfo.itemValue}</td>
+									<td>${fns:abbr(sysDictInfo.itemDesc,15)}</td>
+									<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
+									<td><fmt:formatDate value="${sysDictInfo.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<%-- <td>
 										<button class="btn revision popovers purple-stripe" data-content="${serviceDictInfo.itemDesc}">修改记录查看</button>
 									</td> --%>
@@ -109,15 +109,15 @@
 									      <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
 									      <ul class="dropdown-menu">
 									      
-								        	<li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0"><i class="icon-list"></i>查看</a></li>
+								        	<li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0"><i class="icon-list"></i>查看</a></li>
 								        	<li class="divider"></li>
 									       
 									        <shiro:hasPermission name="sys:dict:edit">
-										        <li><a href="${ctx}/configuration/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要修改吗？', this.href)"><i class="icon-edit"></i> 修改</a></li>
+										        <li><a href="${ctx}/configuration/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要修改吗？', this.href)"><i class="icon-edit"></i> 修改</a></li>
 										        <li class="divider"></li>
 									        </shiro:hasPermission>
 									        <shiro:hasPermission name="sys:dict:edit">
-									       	 	<li><a href="${ctx}/configuration/serviceDictInfo/delete?serviceDictId=${serviceDictInfo.serviceDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要删除吗？', this.href)"><i class="icon-trash"></i> 删除</a></li>
+									       	 	<li><a href="${ctx}/configuration/sysDictInfo/delete?sysDictId=${sysDictInfo.sysDictId}" onclick="return confirmx('数据字典在系统中非常重要，您确认要删除吗？', this.href)"><i class="icon-trash"></i> 删除</a></li>
 											</shiro:hasPermission>
 									    
 									      </ul>
