Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/adminChannel/child_channel_list.jsp

@@ -81,7 +81,7 @@
                 <td><fmt:formatDate value="${infolist.childChannelCreateTime}" pattern="yyyy-MM-dd"/></td>
                 <td>
                     <a onclick="toRebateList(${infolist.mainChannelId})">查看明细</a></br>
-                    <a href="#" onclick="toRebateList(${infolist.mainChannelId})">结算</a>
+                    <%--<a href="#" onclick="toRebateList(${infolist.mainChannelId})">结算</a>--%>
                 </td>
                 </c:forEach>
                 </c:if>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/adminChannel/main_channel_list.jsp

@@ -80,7 +80,7 @@
                 <td><fmt:formatDate value="${infolist.mainChannelCreateTime}" pattern="yyyy-MM-dd"/></td>
                 <td>
                     <a onclick="toRebateList(${infolist.mainChannelId})">查看明细</a><br>
-                    <a href="#" onclick="toRebateList(${infolist.mainChannelId})">结算</a>
+                    <%--<a href="#" onclick="toRebateList(${infolist.mainChannelId})">结算</a>--%>
                 </td>
                 </c:forEach>
                 </c:if>