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/project_mng.xhtml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/project_mng.xhtml b/src/main/webapp/project_mng.xhtml
index e1f6840..907a43c 100644
--- a/src/main/webapp/project_mng.xhtml
+++ b/src/main/webapp/project_mng.xhtml
@@ -76,6 +76,10 @@
<!-- <h:outputText value="#{projectMngController.userIdNameMap.get(row.sysUserId)}"></h:outputText>-->
<h:outputText value="#{row.username}"></h:outputText>
</p:column>
+ <p:column headerText="课题组">
+ <!-- <h:outputText value="#{projectMngController.userIdNameMap.get(row.sysUserId)}"></h:outputText>-->
+ <h:outputText value="#{row.project}"></h:outputText>
+ </p:column>
<p:column headerText="备注">
<h:outputText value="#{row.remark}"></h:outputText>
</p:column>
@@ -97,6 +101,14 @@
</p:row>
<p:row>
<p:column>
+ <p:outputLabel value="课题组"></p:outputLabel>
+ </p:column>
+ <p:column>
+ <p:inputText value="#{projectMngController.sysProject.project}"></p:inputText>
+ </p:column>
+ </p:row>
+ <p:row>
+ <p:column>
<p:outputLabel value="课题名称"></p:outputLabel>
</p:column>
<p:column>
--
Gitblit v1.9.2