From f371735230ecf567655e217d0282376ffa51a77e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 12 Aug 2025 18:21:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/product/service/device/DeviceService.java  | 6 ------
 .../module/product/service/device/DeviceServiceImpl.java    | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/device/DeviceService.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/device/DeviceService.java
index 8d4d137..77c1bc1 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/device/DeviceService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/device/DeviceService.java
@@ -3,10 +3,7 @@ package cn.iocoder.yudao.module.product.service.device;
 import java.util.*;
 import javax.validation.*;
 
-<<<<<<< HEAD
-=======
 import cn.iocoder.yudao.module.product.api.device.dto.DeviceRespDto;
->>>>>>> 6cfa240cdbf3588398a1cbdc4c81c7b8eabb9e20
 import cn.iocoder.yudao.module.product.controller.admin.device.vo.*;
 import cn.iocoder.yudao.module.product.dal.dataobject.device.DeviceDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -61,13 +58,10 @@ public interface DeviceService {
      * @return 贩卖机信息分页
      */
     PageResult<DeviceDO> getDevicePage(DevicePageReqVO pageReqVO);
-<<<<<<< HEAD
-=======
 
     DeviceRespDto getDeviceByDeviceId(String deviceId);
 
     List<DeviceRespDto> getDeviceByDeviceIds(List<String> deviceIds);
 
     int updateDeviceLastChannel(String deviceId, String cabinetChannel);
->>>>>>> 6cfa240cdbf3588398a1cbdc4c81c7b8eabb9e20
 }
\ No newline at end of file
diff --git a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/device/DeviceServiceImpl.java b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/device/DeviceServiceImpl.java
index 7584f38..675c247 100644
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/device/DeviceServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/device/DeviceServiceImpl.java
@@ -1,13 +1,9 @@
 package cn.iocoder.yudao.module.product.service.device;
 
-<<<<<<< HEAD
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
-=======
 import cn.iocoder.yudao.module.product.api.device.dto.DeviceRespDto;
-import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
->>>>>>> 6cfa240cdbf3588398a1cbdc4c81c7b8eabb9e20
 import cn.iocoder.yudao.module.product.service.device.bo.DispenseRequestBo;
 import cn.iocoder.yudao.module.product.service.device.bo.DispenseResponseBo;
 import cn.iocoder.yudao.module.system.api.social.SocialClientApi;
@@ -15,7 +11,6 @@ import cn.iocoder.yudao.module.system.api.social.dto.SocialWxQrcodeReqDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
-import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;