解决代码冲突问题

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -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.mapper.PersonBasicMapper;
 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.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.client.DepartmentClient;
@@ -298,7 +297,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
 
         if (!ObjectUtils.isEmpty(amosUser)) {
             if(amosUser.getStatus()==200){
-                user = (LinkedHashMap<String, Object>) amosUser.getResult();
+                user = amosUser.getResult();
             }else{
                 throw new RuntimeException();
             }