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

manailin

2021-09-30 438e0309b09a70224d6e5be0d60ac5b52aa6df48

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java

@@ -167,6 +167,14 @@
    R getPictureList(Long userId);

    /**
     * 获取系统预置图库  getSysPictureList
     * @return    R   系统图库集
     * @author txb
     * @date 2021/8/27 13:33
     */
    R getSysPictureList(Integer type);

    /**
     * 分页展示我的所有活动 时间倒序排列
     * 
     * @param comActActivityVO