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

src/main/java/com/caimei/modules/user/service/ClubPortraitService.java

@@ -276,7 +276,7 @@ public class ClubPortraitService {
             if (pageTypeList.size() != 0) {
                 for(CmBehaviorRecord record : pageTypeList) {
                     integers.add(record.getNumbers());
-                    strings.add(record.getPageType());
+                    strings.add(record.getPageLabel());
                 }
                 cmPortrait.setPageTypeValue(integers);
                 cmPortrait.setPageType(strings);

src/main/resources/mappings/modules/user/CmPortraitMapper.xml

@@ -75,11 +75,10 @@
         SELECT
                c.clubID,
                COUNT(cbr.pageType) as numbers,
-               cpt.pageType,
+               cbr.pageLabel,
                cbr.accessDate
         FROM cm_behavior_record cbr
         LEFT JOIN club c ON cbr.userID = c.userID
-        LEFT JOIN cm_page_type cpt ON cbr.pageType = cpt.id
         <where>
                 c.clubID = #{clubID}
             <if test="accessDate != null and accessDate != ''">