解决冲突

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

@@ -24,9 +24,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.fegin.PrivilegeFeignClient;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.openfeign.FeignClient;
-=======
 import org.springframework.beans.BeanUtils;
->>>>>>> a5d8520121e78a54ff1c3179fe3673aaa18c6ab9
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -117,9 +115,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
 
 
 
-
-
-
     //新增平台用户
     private ResponseModel<Object> setcreateUser(UserDto userDto,String appKey, String product, String token){
         ResponseModel<Object> date=   privilegeFeignClient.create(appKey, product, token,userDto);