解决冲突

src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp

@@ -184,8 +184,11 @@
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>
-										<c:if test="${_log.action eq 16 }"><spring:message code="action_reject"/></c:if>
-										<c:if test="${_log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+											<c:if test="${dict.itemCode eq _log.action}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
 									</td>
 									<td>${_log.foundTime }</td>
 									<td>${_log.entranceId }</td>