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

2018-08-31 11:26:57 +08:00
parent 4393f94a5a a9dda3a53b
commit 217d780e25
1 changed files with 1 additions and 1 deletions
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -38,7 +38,7 @@ $(document).ready(function(){
 	      <spring:message code="encrypted_tunnel_behavior"/>
 	   </c:if>
 	   <c:if test="${log.functionId == 63}">
-	      <spring:message code="app_policy_config"/>
+	      <spring:message code="social_app_control"/>
 	   </c:if>
 	</h3>