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

peng

3 天以前 aac2321d1cf5536f7ea03f30d55a4aba30fbf710

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

@@ -528,6 +528,11 @@
     */
    VIDEO_COLLECT_NUM,

    /**
     * 视频点赞数量
     */
    VIDEO_THUMBS_UP_NUM,


    /**
     * 扫码登录