Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-23 8b6a2a67a0bf081252648ba46fffd5591b3afc98

 src/main/webapp/laboratory_mng.xhtml

@@ -70,7 +70,7 @@
               <h:outputText value="#{row.name}"></h:outputText>
            </p:column>

            <p:column headerText="所属项目组">
            <p:column headerText="课题组">
               <h:outputText value="#{row.project}"></h:outputText>
            </p:column>