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

This commit is contained in:
leijun
2018-08-31 11:22:00 +08:00

View File

@@ -246,7 +246,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th> <th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="policy_name"/></th> <th><spring:message code="group"/></th>
<th><spring:message code="block_type"/></th> <th><spring:message code="block_type"/></th>
<%-- <th><spring:message code="do_log"/></th> <%-- <th><spring:message code="do_log"/></th>
<th><spring:message code="whether_area_block"/></th> <th><spring:message code="whether_area_block"/></th>