From a9780c49f8cf587af26cc83d439320ad02b8668f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 15 Oct 2025 09:17:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java
index a449570..3d02b52 100644
--- a/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java
@@ -1,11 +1,11 @@
 package com.ard.sample.storage.service.impl;
 
+import com.ard.common.config.OssConfiguration;
 import com.ard.sample.component.mqtt.model.*;
 import com.ard.sample.component.mqtt.service.IMessageSenderService;
-import com.ard.sample.component.oss.model.OssConfiguration;
-import com.ard.sample.component.oss.service.impl.OssServiceContext;
-import com.ard.sample.media.model.StsCredentialsDTO;
+import com.ard.oss.model.StsCredentialsDTO;
 import com.ard.sample.storage.service.IStorageService;
+import com.ard.oss.service.impl.OssServiceContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.annotation.ServiceActivator;
 import org.springframework.integration.mqtt.support.MqttHeaders;

--
Gitblit v1.9.3