Merge branch 'dyf-device' into 6170

# Conflicts:
#	fys-admin/src/main/resources/application-prod.yml

fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceHBYController.java

@@ -28,6 +28,7 @@ public class AppDeviceHBYController extends BaseController {
 
     private final DeviceBJQBizService appDeviceService;
 
+
     /**
      * 获取设备详细信息
      *

fys-admin/src/main/resources/application-prod.yml

@@ -283,8 +283,8 @@ mqtt:
   password: #YtvpSfCNG
   url: tcp://47.120.79.150:3883
   subClientId: fys_subClient
-  subTopic: A/#
-  pubTopic: B/#
+  subTopic: A/#,status/tenantCode/#,report/tenantCode/#
+  pubTopic: B/#,command/tenantCode/#
   pubClientId: fys_pubClient
 
 # TTS语音交互配置