From 8932ae2a8dc22513c2b7925997dfb65983ea1d19 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 15 Dec 2020 15:42:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/webapp/approval_mng.xhtml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/approval_mng.xhtml b/src/main/webapp/approval_mng.xhtml
index bc9ffe7..e08bef5 100644
--- a/src/main/webapp/approval_mng.xhtml
+++ b/src/main/webapp/approval_mng.xhtml
@@ -147,8 +147,11 @@
<h:outputText value="#{row.second}"></h:outputText>
</p:column>
<!--现在报销不按课题编号了，所以先注释掉-->
- <p:column headerText="课题编号" width="83px;">
- <h:outputText value="#{row.objective}"></h:outputText>
+<!-- <p:column headerText="课题编号" width="83px;">-->
+<!-- <h:outputText value="#{row.objective}"></h:outputText>-->
+<!-- </p:column>-->
+ <p:column headerText="备注" width="83px;">
+ <h:outputText value="#{row.memo}"></h:outputText>
</p:column>
</p:dataTable>
</p:panel>
--
Gitblit v1.9.2