Merge remote-tracking branch 'origin/master' into mqy20260511

iot-platform/src/main/java/com/iot/platform/service/TDengineService.java

@@ -6,6 +6,7 @@ import com.zaxxer.hikari.HikariDataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayOutputStream;
@@ -24,7 +25,8 @@ public class TDengineService {
     private final ExecutorService batchExecutor;
 
     @Autowired
-    public TDengineService(ExecutorService tdengineBatchExecutor, IotProperties iotProperties) {
+    public TDengineService(@Qualifier("tdengineBatchExecutor") ExecutorService tdengineBatchExecutor,
+                           IotProperties iotProperties) {
         this.batchExecutor = tdengineBatchExecutor;
         this.iotProperties = iotProperties;
     }