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

src/main/resources/messages/message_en.properties

@@ -228,4 +228,7 @@ block_url=block url
 configuration=configuration
 direction=direction
 protocol=protocol
+oneway=oneway
+twoway=twoway
+arbitrary=arbitrary
 #==========guankongbaimingdan end=====================

src/main/resources/messages/message_zh_CN.properties

@@ -226,4 +226,7 @@ block_url=\u5c01\u5835\u8def\u5f84
 configuration=\u914d\u7f6e
 direction=\u65b9\u5411
 protocol=\u534f\u8bae
+oneway=\u5355\u5411
+twoway=\u53cc\u5411
+arbitrary=\u4efb\u610f
 #==========guankongbaimingdan end=====================

src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp

@@ -98,8 +98,8 @@
 									<!-- <th>编译id</th> -->
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="type"/></th>
+									<th><spring:message code="attribute"/></th>
 									<th><spring:message code="label"/></th>
-									<th><spring:message code="property"/></th>
 									<!-- <th>区域生效id</th> -->
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>