Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -395,6 +395,7 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
                 devList.get(i).setCreatedTime(LocalDateTime.now());
                 devList.get(i).setTenantId(list.get(0).getTenantId());
                 devList.get(i).setServiceStatus(1);
+                devList.get(i).setDeviceUuid(UUIDUtils.uuid());
 
                 DmpDeviceStatus dmpDeviceStatus = new DmpDeviceStatus();
                 dmpDeviceStatus.setDeviceId(devList.get(i).getDeviceId());

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingRoomController.java

@@ -49,7 +49,7 @@ public class MeetingRoomController {
     public ApiResult<Map<String,Object>> control(@PathVariable("productCode") String productCode,
                                                  @PathVariable("deviceId") String deviceId,
                                                  @RequestParam(value = "commandStr") String commandStr,
-                                                 @RequestParam(value = "domain") String domain){
+                                                 @RequestParam(value = "domain",required = false) String domain){
         Integer tenantId;
         if(StringUtils.isNotBlank(domain)){
             tenantId = dmMeetingRoomRepository.getTenantIdByDomain(domain);