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

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>