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

# Conflicts:
#	src/main/resources/export/discern_receipt.xls

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -370,7 +370,7 @@
                 </select>&nbsp;&nbsp;&nbsp;&nbsp;
                 <c:if test="${!empty product.keywords}">
                     <span style="display: inline-block; width: 120px">供应商关联标签：（${product.shopName}）</span>
-                    <span><textarea rows="6" style="width: 700px;">${product.keywords}</textarea></span>
+                    <span><textarea rows="6" style="width: 700px; pointer-events: none">${product.keywords}</textarea></span>
                 </c:if>
             </td>
         </tr>

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

@@ -101,11 +101,13 @@
                             ---
                         </c:if>
                         <c:if test="${not empty statistics.customerSource}">
-                            <c:if test="${statistics.customerSource == 0}">公众号</c:if>
-                            <c:if test="${statistics.customerSource == 1}">小红书</c:if>
-                            <c:if test="${statistics.customerSource == 2}">微博</c:if>
-                            <c:if test="${statistics.customerSource == 3}">搜狐</c:if>
-                            <c:if test="${statistics.customerSource == 4}">其他</c:if>
+                            <c:if test="${statistics.customerSource == 0}">网址</c:if>
+                            <c:if test="${statistics.customerSource == 1}">小程序</c:if>
+                            <c:if test="${statistics.customerSource == 2}">公众号</c:if>
+                            <c:if test="${statistics.customerSource == 3}">小红书</c:if>
+                            <c:if test="${statistics.customerSource == 4}">微博</c:if>
+                            <c:if test="${statistics.customerSource == 5}">搜狐</c:if>
+                            <c:if test="${statistics.customerSource == 6}">其他</c:if>
                         </c:if>
                     </div>
                 </div>