Commit 8ea4e995 authored by 王亚雷's avatar 王亚雷

Merge remote-tracking branch 'origin/v2.3.1' into dev

parents 6a93fcf5 78260160
...@@ -6,6 +6,7 @@ import com.tanpu.community.api.beans.qo.feign.fatools.UserInfoCorpReq; ...@@ -6,6 +6,7 @@ import com.tanpu.community.api.beans.qo.feign.fatools.UserInfoCorpReq;
import com.tanpu.community.api.beans.req.page.Page; import com.tanpu.community.api.beans.req.page.Page;
import com.tanpu.community.api.beans.resp.SysConstantResp; import com.tanpu.community.api.beans.resp.SysConstantResp;
import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp; import com.tanpu.community.api.beans.vo.feign.course.ShortVideoBaseInfoResp;
import com.tanpu.community.api.beans.vo.feign.fatools.SimpleUserInfo;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoChiefInvAdvResp; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoChiefInvAdvResp;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoCorpResp; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoCorpResp;
import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief; import com.tanpu.community.api.beans.vo.feign.fatools.UserInfoNewChief;
...@@ -101,7 +102,7 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool ...@@ -101,7 +102,7 @@ public class FeignbackForFatools implements FallbackFactory<FeignClientForFatool
return CommonResp.error(); return CommonResp.error();
} }
@Override @Override
public CommonResp<List<UserInfoResp>> simpleUserList(List<String> idList) { public CommonResp<List<SimpleUserInfo>> simpleUserList(List<String> idList) {
log.error("查询参数: {}", JSON.toJSONString(idList)); log.error("查询参数: {}", JSON.toJSONString(idList));
log.error("查询异常", throwable); log.error("查询异常", throwable);
return CommonResp.error(); return CommonResp.error();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment