Merge branch 'master' into 'i18n'

fix: 组态模板暂不进行云边同步

See merge request yunteng/thingskit!433

@@ -144,10 +144,11 @@ public class TkConfigurationContentServiceImpl
   }
   public Boolean findIsTemplate(String configurationId){
     boolean isTemplate = false;
-    TkConfigurationCenterEntity center  = configurationCenterMapper.selectById(configurationId);
-    if(center.getIsTemplate()==1){
-      isTemplate = true;
-    }
+    //组态模板暂不进行云边同步
+//    TkConfigurationCenterEntity center  = configurationCenterMapper.selectById(configurationId);
+//    if(center.getIsTemplate()==1){
+//      isTemplate = true;
+//    }
     return  isTemplate;
   }