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

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

@@ -106,6 +106,7 @@
         co.onlinePayFlag AS onlinePayFlag,
         bou.shouHuoRen AS receiver,
         u.name AS buyer,
+        c.clubID AS clubID,
         co.orderSource AS orderSource,
         co.orderTotalFee AS orderTotalFee,
         co.payableAmount AS payableAmount,

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

@@ -274,12 +274,12 @@
 <%--                </c:if>--%>
 <%--            </li>--%>
             <li>
-
-                <c:if test="${order.organizeID == 1}">
-                    <span class="org-note">星范</span>
-                </c:if>
-
-                    ${order.buyer}
+                <a href="${ctx}/new/user/agency/clubPortrait?clubID=${order.clubID}&dateType=0&type=4">
+                    <c:if test="${order.organizeID == 1}">
+                        <span class="org-note">星范</span>
+                    </c:if>
+                        ${order.buyer}
+                </a>
             </li>
             <li>${order.receiver}</li>
             <li>${fns:getDictLabel(order.orderSource,"bp_orderSource","" )}</li>

src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp

@@ -184,7 +184,7 @@
             <td>${newCmClubList.clubID}</td>
             <td>
 <%--                <c:if test="${newCmClubList.userIdentity eq 2}">--%>
-                    ${newCmClubList.name}
+                <a href="${ctx}/new/user/agency/clubPortrait?clubID=${newCmClubList.clubID}&clubName=${newCmClubList.name}&dateType=0&type=4">${newCmClubList.name}</a>
 <%--                </c:if>--%>
 <%--                <c:if test="${newCmClubList.userIdentity eq 4}">--%>
 <%--                    <c:if test="${newCmClubList.name ne newCmClubList.userName}">--%>