Commit 49627b03 authored by 高建强's avatar 高建强

解决代码冲突问题

parent cc5bab4c
...@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic; ...@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
import com.yeejoin.amos.boot.module.jxiop.api.entity.*; import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper; import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService; import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService;
import com.yeejoin.amos.boot.module.jxiop.biz.fegin.PrivilegeFeignClient;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.client.DepartmentClient; import com.yeejoin.amos.feign.privilege.client.DepartmentClient;
...@@ -298,7 +297,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas ...@@ -298,7 +297,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
if (!ObjectUtils.isEmpty(amosUser)) { if (!ObjectUtils.isEmpty(amosUser)) {
if(amosUser.getStatus()==200){ if(amosUser.getStatus()==200){
user = (LinkedHashMap<String, Object>) amosUser.getResult(); user = amosUser.getResult();
}else{ }else{
throw new RuntimeException(); throw new RuntimeException();
} }
......
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