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

src/main/webapp/WEB-INF/templates/basic/voucherRule/view.ftl

@@ -479,6 +479,16 @@ function getResourceList(page){
             </td>
             </td>
         </tr> 
         </tr> 
         <tr>
         <tr>
+            <td style="text-align:left">可分享</td>
+            <td style="text-align:left">
+	            <#if dto.shared == 1>
+	            		是
+	            <#elseif dto.shared == 0>
+	            		否
+	            </#if>           
+            </td>
+        </tr> 
+        <tr>
         	<#if dto.sendToUserType == 1>
         	<#if dto.sendToUserType == 1>
             <td style="text-align:left">发放用户类型</td>
             <td style="text-align:left">发放用户类型</td>
             <td style="text-align:left">${dto.sendToUserValueMsg!}</td>
             <td style="text-align:left">${dto.sendToUserValueMsg!}</td>

src/main/webapp/WEB-INF/templates/communeOrder/list/communeOrderListPaysuccess.ftl

@@ -11,6 +11,9 @@
         <th>实付金额</th>
         <th>实付金额</th>
         <th>状态</th>
         <th>状态</th>
         <th>推荐码</th>
         <th>推荐码</th>
+        <th>下单渠道</th>
+        <th>推荐人</th>
+        <th>推荐人UID</th>
         <th>接管人</th>
         <th>接管人</th>
     </tr>
     </tr>
     
     
@@ -24,6 +27,13 @@
             <td>${item.totalAmount!}</td>
             <td>${item.totalAmount!}</td>
             <td>${item.orderStatusString!}</td>
             <td>${item.orderStatusString!}</td>
             <td>${item.recommendCode!}</td>
             <td>${item.recommendCode!}</td>
+            <#if item.platform =='MP'>  
+                  <td>小程序</td>
+            <#else>
+                 <td>${item.platform!}</td>
+            </#if>
+            <td>${item.recommendName!}</td>
+            <td>${item.recommendUid!}</td>
             <td>${item.receiver!}</td>
             <td>${item.receiver!}</td>
         </tr>
         </tr>
         </#list>
         </#list>