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

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

 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>