修改冲突

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java

@@ -37,15 +37,12 @@ import com.baiye.model.enums.ResponseCode;
 import com.baiye.modules.platform.domain.*;
 import com.baiye.modules.platform.repository.*;
 import com.baiye.modules.platform.service.*;
-import com.baiye.modules.platform.service.dto.*;
-import com.baiye.modules.report.dao.TaskReportRepository;
-import com.baiye.modules.report.dao.UserReportRepository;
-import com.baiye.modules.report.service.QueryReportService;
-import com.baiye.modules.system.mapstruct.UserMapper;
 import com.baiye.modules.platform.service.dto.BuyComboDTO;
 import com.baiye.modules.platform.service.dto.CompanyDto;
 import com.baiye.modules.platform.service.dto.CreateUserDTO;
 import com.baiye.modules.platform.service.dto.UpdateOrderDto;
+import com.baiye.modules.report.dao.TaskReportRepository;
+import com.baiye.modules.report.dao.UserReportRepository;
 import com.baiye.modules.system.domain.Role;
 import com.baiye.modules.system.domain.User;
 import com.baiye.modules.system.dto.UserQueryCriteria;
@@ -60,13 +57,11 @@ import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.cache.Cache;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;