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

peng

8 天以前 62b3e99c68eb75a2c5cd86eb748534bd266ad009

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

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

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


    /**
     * 扫码登录