解决冲突

da0ab26b · tony001 · 2ea3e1a6 · da0ab26b · da0ab26b · da0ab26b
--- a/@CONTROL/数据看板/CONTROL-BASE.vue.ftl
+++ b/@CONTROL/数据看板/CONTROL-BASE.vue.ftl
--- a/@CONTROL/选择视图面板/CONTROL-BASE.vue.ftl
+++ b/@CONTROL/选择视图面板/CONTROL-BASE.vue.ftl
--- a/@CONTROL/选择视图面板/CONTROL.html.ftl
+++ b/@CONTROL/选择视图面板/CONTROL.html.ftl
--- a/@VIEW/@MACRO/VIEW_HEADER-BASE.vue.ftl
+++ b/@VIEW/@MACRO/VIEW_HEADER-BASE.vue.ftl