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

xiangpei

8 天以前 3c378a12577695f4de03fd2fbe83c033f1369c3f

 framework/src/main/java/cn/lili/cache/CachePrefix.java

@@ -519,6 +519,17 @@
    VIDEO_COMMENT_LIKE_NUM,

    /**
     * 视频评论数量
     */
    VIDEO_COMMENT_NUM,

    /**
     * 视频收藏数量
     */
    VIDEO_COLLECT_NUM,


    /**
     * 扫码登录
     *
     * @param str