解决冲突

@CONTROL/选择视图面板/CONTROL.html.ftl

-<#--  content  -->
-<#assign content>
-    :isSingleSelect="isSingleSelect"
-    :selectedData="selectedData"
-    :isShowButton="isShowButton"
-    :openMode="openMode"
-</#assign>
-<#ibizinclude>
-../@MACRO/HTML/DEFAULT.html.ftl
+<#--  content  -->
+<#assign content>
+    :isSingleSelect="isSingleSelect"
+    :selectedData="selectedData"
+    :isShowButton="isShowButton"
+    :openMode="openMode"
+</#assign>
+<#ibizinclude>
+../@MACRO/HTML/DEFAULT.html.ftl
 </#ibizinclude>
\ No newline at end of file