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

peng

3 天以前 211b5a717de92b9b52879280ca2285cdd0b4a54b

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

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

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


    /**
     * 扫码登录