Merge branch 'bugfix_1115' into 'master'

bugfix

See merge request !21

community-service/src/main/java/com/tanpu/community/feign/activity/FeignBackClientForActivity.java

 package com.tanpu.community.feign.activity;
 
-import com.alibaba.fastjson.JSONObject;
 import com.tanpu.common.api.CommonResp;
-import com.tanpu.community.api.beans.req.page.Page;
 import com.tanpu.community.api.beans.vo.feign.activity.OfflineActivitySimpleResp;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -32,7 +30,7 @@ public class FeignBackClientForActivity implements FallbackFactory<FeignClientFo
             }
 
             @Override
-            public CommonResp<List<OfflineActivitySimpleResp>> queryCorpHomeActivityList(String orgId) {
+            public CommonResp<List<OfflineActivitySimpleResp>> queryCorpHomeActivityList(String orgId,String userId) {
                 log.error("请求信息", throwable);
                 log.error("FeignClientForActivity.offlineActivityDetail-查询活动orgId:{}", orgId);
                 return CommonResp.error();