Merge branch '20220310' into 'master'

fix: 启动第二个场景联动时，第一个场景联动的触发器信息丢失的问题

See merge request huang/thingsboard3.3.2!63

@@ -428,9 +428,9 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         for (Trigger item : triggers) {
             String deviceId = item.getEntityId();
             List<String> scenes = devices.computeIfAbsent(deviceId, k -> new ArrayList<String>());
-            String scenId = item.getSceneLinkageId();
-            if (!scenes.contains(scenId)) {
-                scenes.add(sceneId);
+            String triggerScenId = item.getSceneLinkageId();
+            if (!scenes.contains(triggerScenId)) {
+                scenes.add(triggerScenId);
             }
             if (scenes.isEmpty()) {
                 devices.remove(deviceId);