From 8932ae2a8dc22513c2b7925997dfb65983ea1d19 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 15 十二月 2020 15:42:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/webapp/laboratory_container_mng.xhtml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index f00faa3..cedb6ed 100644
--- a/src/main/webapp/laboratory_container_mng.xhtml
+++ b/src/main/webapp/laboratory_container_mng.xhtml
@@ -42,6 +42,8 @@
 				</p:commandButton>
 				<p:commandButton value="导入" styleClass="import-btn" onclick="importCon()"
 				></p:commandButton>
+				<p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="${laboratoryContainerMngController.export2Excel}"
+				/>
 				<script>
 					function importCon(){
 						$("#laboratoryContainerMngForm\\:importReagentBtn_input").click();

--
Gitblit v1.9.2