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

peng

20 小时以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

 framework/src/main/resources/mapper/lmk/MySubscribeMapper.xml

@@ -34,8 +34,7 @@
            LMS.subscribe_user_id,
            LMS.id,
            LM.nick_name,
            LM.face,
            (SELECT COUNT(*) FROM lmk_my_subscribe WHERE subscribe_user_id = LMS.subscribe_user_id AND delete_flag = 0) as fans_num
            LM.face
        FROM
            lmk_my_subscribe LMS
                LEFT JOIN li_member LM ON LMS.subscribe_user_id = LM.id