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

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

@@ -78,7 +78,7 @@ public class BaseAlarmNoticeServiceImpl extends AbstractCrudService<BaseAlarmNot
                 .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarmNotice::getProductCode,
                         baseAlarmListVO.getProductCode())
                 .eq(BaseAlarmNotice::getDeleteFlag,0)
-//                .eq(BaseAlarmNotice::getTenantId,SecurityUtils.getTenantId())
+                .eq(BaseAlarmNotice::getTenantId,SecurityUtils.getTenantId())
                 .orderByDesc(BaseAlarmNotice::getId);
         page  = this.page(page,queryWrapper);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());