From 20e1449578ac0e558dc038e302001d3a6819ab2c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 18 十二月 2020 11:52:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/webapp/laboratory_container_mng.xhtml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index 132b56a..0b319b0 100644
--- a/src/main/webapp/laboratory_container_mng.xhtml
+++ b/src/main/webapp/laboratory_container_mng.xhtml
@@ -69,7 +69,7 @@
</p:column>
<p:column headerText="课题组">
- <h:outputText value="#{sysProjectServiceImpl.getSysProject(row.projectId).projectName}"></h:outputText>
+ <h:outputText value="#{sysProjectServiceImpl.getSysProject(row.projectId).project}"></h:outputText>
</p:column>
<p:column headerText="主控名称">
--
Gitblit v1.9.2