补提dns关键字组配置页面

(cherry picked from commit 2404bd69a4)

src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormAdd.jsp

@@ -135,7 +135,7 @@ var reSort=function(obj,index){
 								            	 <select name="userRegion1" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
 								               		<option value=""><spring:message code="select"/></option>
 									               	<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
-									               			<option value="${dnsGroupInfo.groupId}">${dnsGroupInfo.groupName}</option>
+									               			<option value="${dnsGroupInfo.serviceGroupId}">${dnsGroupInfo.groupName}</option>
 									               	</c:forEach>
 								               	</select>
 								            </div>

src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgFormUpdate.jsp

@@ -90,7 +90,7 @@ $(function(){
 								            	 <select name="userRegion1" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
 								               		<option value=""><spring:message code="select"/></option>
 									               	<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
-									               			<option value="${dnsGroupInfo.groupId}" <c:if test="${cfg.userRegion1 eq dnsGroupInfo.groupId }">selected</c:if>>${dnsGroupInfo.groupName}</option>
+									               			<option value="${dnsGroupInfo.serviceGroupId}" <c:if test="${cfg.userRegion1 eq dnsGroupInfo.serviceGroupId }">selected</c:if>>${dnsGroupInfo.groupName}</option>
 									               			
 									               	</c:forEach>
 								               	</select>

src/main/webapp/WEB-INF/views/basics/dnsKeywordCfgList.jsp

@@ -266,7 +266,9 @@
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" isValid="${cfg.isValid}" value="${cfg.isAudit}"></td>
 									<td>${cfg.cfgDesc }</td>
 									<td>${cfg.cfgKeywords }</td>
-									<td>${cfg.userRegion1}</td>
+									<td>
+									${cfg.dnsGroupName}
+									</td>
 									<td>
 										<c:choose>
 											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>