解决冲突

web/building_saas/main/js/views/main_tree_col.js

@@ -326,8 +326,7 @@ let MainTreeCol = {
         let tips = '';
         if (node.data.programID != null){
           let tpl = projectObj.project.calcProgram.compiledTemplates[node.data.programID];
-          if(tpl) tips = tpl.ID + ' ' + tpl.name + '：' + (tpl.memo ? tpl.memo : '[无]');   // 加个判断保护，兼容旧项目此处空值
-          
+          if(tpl) tips = tpl.ID + ' ' + tpl.name + '：' + (tpl.memo ? tpl.memo : '[无]');   // 加个判断保护，兼容旧项目此处空值 
         };
         let dynamicCombo = sheetCommonObj.getTipsCombo(true, tips, setting, node);
         dynamicCombo.itemHeight(10).items(projectObj.project.calcProgram.compiledTemplateNames).editable(false);