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

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

@@ -126,7 +126,7 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                 .orderByDesc(BaseGgpFacility::getId);
         List<BaseGgpFacility> baseGgpFacilityList = this.list(queryWrapper);
         List<BaseGgpFacilityExportVo> list = new ArrayList<>();
-        List<BaseGgpFacilityTypeNumVO> typeList = baseFacilityTypeMapper.typeNumList(1);
+        List<BaseGgpFacilityTypeNumVO> typeList = baseFacilityTypeMapper.typeNumList(SecurityUtils.getTenantId());
         if (CollectionUtils.isNotEmpty(baseGgpFacilityList)) {
             for (int i = 0; i < baseGgpFacilityList.size(); i++) {
                 BaseGgpFacilityExportVo baseGgpFacilityExportVo = new BaseGgpFacilityExportVo();