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

This commit is contained in:
zhangshilin
2018-04-09 17:54:34 +08:00
2 changed files with 41 additions and 33 deletions

View File

@@ -69,7 +69,7 @@ function checkNum(obj) {
<form:option value="1"><spring:message code="block"/></form:option>
<form:option value="2"><spring:message code="monitor"/></form:option>
<form:option value="5"><spring:message code="block_white_list"/></form:option>
<form:option value="6"><spring:message code="monitor"/></form:option>
<form:option value="6"><spring:message code="monitor_white_list"/></form:option>
<form:option value="7"><spring:message code="block_monitor_white_list"/></form:option>
<form:option value="8"><spring:message code="grey_list"/></form:option>
</form:select>