Commit b8c4b946489bd4dd46093aa600fef68e8d426f35

Authored by xp.Huang
2 parents 93ae3575 b58b5667

Merge branch 'cherry-pick-b94d231f' into 'master_dev'

feat:报表配置中,选择设备时将网关设备选择权限放出来

See merge request yunteng/thingskit!426
... ... @@ -130,6 +130,7 @@ public class TkSceneLinkageController extends BaseController {
130 130 List<DeviceTypeEnum> filter = new ArrayList<>();
131 131 filter.add(DeviceTypeEnum.DIRECT_CONNECTION);
132 132 filter.add(DeviceTypeEnum.SENSOR);
  133 + filter.add(DeviceTypeEnum.GATEWAY);
133 134 List<DeviceDTO> dtoList =
134 135 sceneLinkageService.findDeviceList(
135 136 organizationId,
... ...