From e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 25 六月 2021 16:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/user_mng.xhtml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/user_mng.xhtml b/src/main/webapp/user_mng.xhtml
index 5e590ba..4764996 100644
--- a/src/main/webapp/user_mng.xhtml
+++ b/src/main/webapp/user_mng.xhtml
@@ -35,7 +35,7 @@
             </p:panelGrid>
         </p:panel>
         <p:panel styleClass="center-body">
-            <p:panelGrid columns="5" styleClass="btn">
+            <p:panelGrid columns="6" styleClass="btn">
                 <p:commandButton value="新建" styleClass="new-btn"
                                  process="@form"
                                  actionListener="#{userMngController.onNewBtnClick}"
@@ -60,6 +60,8 @@
                 <p:outputLabel rendered="#{userMngController.isAccess('导入')}">
                     <a href="resources/template/用户导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
                 </p:outputLabel>
+                <p:commandButton value="导出" styleClass="new-btn" ajax="false"  actionListener="#{userMngController.exportLab2Excel}"
+                />
                 <script>
                     function importUser(){
                         $("#userMngForm\\:importUserBtn_input").click();

--
Gitblit v1.9.2