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

Conflicts: src/main/java/com/nis/domain/Page.java src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
2018-03-06 18:54:04 +08:00
parent 663d4f7f0f 173d80f07f
commit b21c159fdd
13 changed files with 205 additions and 396 deletions
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -10,6 +10,7 @@
            </div>
        </div>
    </div>
+    
    <div class="col-md-6">
        <div class="form-group ">
            <label class="control-label col-md-3">匹配区域</label>