Merge branch 'feature-slimming-nas-20220130-dsx' into test

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -873,7 +873,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                 JSONObject sceneJson = JSON.parseObject(sceneJsonStr);
                 version = sceneJson.getIntValue("version");
                 imgVersion = sceneJson.getIntValue("imgVersion");
-//                linkVersion =  sceneJson.getIntValue("linkVersion");
+                linkVersion =  sceneJson.getIntValue("linkVersion");
             }
 
             if(version < sceneEditInfo.getVersion()){