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

This commit is contained in:
wangxin
2018-09-10 17:23:16 +08:00

View File

@@ -232,7 +232,7 @@
</a>
</c:if>
</td>
<td title="${log.emlKey }">${fns:abbr(log.emlKey, 42)}</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="logProtocol">