Merge remote-tracking branch 'origin/new-exam' into new-exam

ruoyi-admin/src/main/resources/templates/system/tdmeeting/meetingnum/meetingnum.html

@@ -82,6 +82,11 @@
                     </div>
                 </form>
             </div>
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:tdmeeting:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
             <div class="col-sm-12 select-table table-striped" style="min-height: 82%">
                 <table id="bootstrap-table"></table>
             </div>
@@ -240,6 +245,7 @@
         var options = {
             url: prefix + "/list",
             detailUrl: ctx +  "system/tdmeeting/detail/{id}",
+            exportUrl: ctx + "system/tdmeeting/export",
             modalName: "涉密会议登记",
             columns: [{
                 checkbox: true