解决合并代码冲突

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 
-import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonDto;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.UserDto;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.*;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
-import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonUser;
 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.api.dto.PersonBasicDto;
 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;
@@ -198,9 +196,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
      * 分页查询
      */
     public Page<UserMapperDto> queryPage(Page<UserMapperDto> page,
-                                           String name,
-                                           String accountName,
-                                           String projectId)   {
+                                         String name,
+                                         String accountName,
+                                         String projectId)   {
         List<UserMapperDto> list=personBasicMapper.queryPage((page.getCurrent()-1) * page.getSize(),page.getSize(),  name,
                 accountName,
                 projectId);