Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

# Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/extag/extag.html

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/extag/extag.html

@@ -197,6 +197,9 @@
             <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="goblin:extag:rmv">
                 <i class="fa fa-remove"></i> 删除
             </a>
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="goblin:extag:export">
+                <i class="fa fa-download"></i> 导出
+            </a>
         </div>
 
         <div class="col-sm-12 select-table table-striped">
@@ -272,6 +275,7 @@
         var options = {
             url: prefix + "/list",
             removeUrl: prefix + "/rmv",
+            exportUrl: prefix + "/export",
             sortName: "mid desc",
             modalName: "音乐人标签库",
             columns: [{

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/tag/tag.html

@@ -10,8 +10,7 @@
             <a class="btn btn-success" onclick="" shiro:hasPermission="goblin:extag:add">
                 <i class="fa fa-plus"></i> 新增
             </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()"
-               shiro:hasPermission="goblin:extag:rmv">
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="goblin:extag:rmv">
                 <i class="fa fa-remove"></i> 删除
             </a>
         </div>