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

ruoyi-admin/src/main/resources/templates/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
-    <title>保密业务综合管理系统首页</title>
+    <title>保密业务综合管理系统</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link th:href="@{favicon.ico}" rel="shortcut icon"/>

ruoyi-admin/src/main/resources/templates/system/usernum/usernum.html

@@ -47,9 +47,9 @@
 				</div>
 
 		        <div class="btn-group-sm" id="toolbar" role="group">
-		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:usernum:export">
+<!--		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:usernum:export">-->
-			            <i class="fa fa-download"></i> 导出
+<!--			            <i class="fa fa-download"></i> 导出-->
-			        </a>
+<!--			        </a>-->
 		        </div>
 		        <div class="col-sm-12 select-table table-striped">
 				    <table id="bootstrap-table"></table>