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

2018-05-28 10:21:12 +08:00
parent f996f5bff0 86cf73fee4
commit 4930cd4c61
7 changed files with 153 additions and 16 deletions
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -171,7 +171,7 @@ $(function(){
 							        </div>
 							    </div>
 							</div>
-							<div class="row hidden protocol">
+							<div class="row hidden destPort">
 								<div class="col-md-6">
 							        <div class="form-group ">
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>