Merge remote-tracking branch 'origin/developerF' into developerF

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -921,7 +921,7 @@
                c.name as clubName
         from cm_svip_history svipr
         left join cm_receipt_order_relation cror on svipr.id = cror.vipRecordId
-        left join club c on svipr.userId = c.clubID
+        left join club c on svipr.userId = c.userId
         left join cm_svip_package svipp on svipp.id = svipr.packageId
         where cror.receiptID=#{receiptID}
         LIMIT 1

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptForm.jsp

@@ -418,7 +418,7 @@
         <div class="receipt-order-form">
             <div>
                 <c:if test="${not empty vo.vipInfo}">
-                    <span>机构名称：${vo.clubName}</span>
+                    <span>机构名称：${vo.vipInfo.clubName}</span>
                     <br/>
                     <span>购买时间：${vo.receiptDate}</span>
                     <span>会员套餐：${vo.vipInfo.duration}个月</span>