From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
index a3d6428..237c964 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
@@ -1,13 +1,11 @@
 package com.doumee.api.business;
 
-import com.doumee.api.BaseController;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
 import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.Company;
 import com.doumee.dao.business.model.Device;
 import com.doumee.service.business.DeviceService;
 import io.swagger.annotations.Api;
@@ -21,6 +19,7 @@
 import java.util.Date;
 import java.util.List;
 
+import com.doumee.api.BaseController;
 /**
  * @author 姹熻箘韫�
  * @date 2023/11/30 15:33

--
Gitblit v1.9.3