Merge branch 'f-6.6.7' of 192.168.10.6:caosy/fun-admin into f-6.6.7

src/main/webapp/WEB-INF/templates/500.ftl

 <@com.layout title="系统异常" module="error" current="error">
 
 <div class="alert alert-error">
-    哇噢>.<，系统发生异常，请联系程序猿：爱玩开发（iwdev@Ctrip.com）！！！
+    哇噢>.<，系统发生异常，请联系程序猿：爱玩开发（iwantech@ctripiwan.com）！！！
 </div>
 
 </@com.layout>

src/main/webapp/WEB-INF/templates/golf/resourcePriceList.ftl

@@ -51,9 +51,9 @@
         <th>会员返现</th>
         <th>预付款</th>
         <th>vip首单立减</th>
-        <th>vip随机立减</th>    <!--
+        <th>vip随机立减</th>    
         <th>社员价</th>
-        <th>社员立减</th>   -->
+        <th>社员立减</th>   
         <th>社员嘉宾价</th>
         <th>社员嘉宾立减</th>
         <th>状态</th>
@@ -87,8 +87,8 @@
             <td>${item.prepaidPrice}</td>
             <td>${item.vipFirstReduction}</td>
             <td>${item.vipMinRandom} ~ ${item.vipMaxRandom}</td>
-       <!--     <td>${item.communePrice!}</td>
-            <td>${item.communeMinus!}</td>-->
+            <td>${item.communePrice!}</td>
+            <td>${item.communeMinus!}</td>
             <td>${item.communeGuestPrice!}</td>
             <td>${item.communeGuestMinus!}</td>
             <td>${item.getStatusDisplay()}</td>