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

gdg

2020-12-03 603e9146d9c09c9cfbadb4d049d3e6111a2f9b14

 src/main/webapp/reagent_mng.xhtml

@@ -28,7 +28,6 @@
                </p:selectOneMenu>
                <p:outputLabel value="种类："></p:outputLabel>
                <p:selectOneMenu value="#{reagentMngController.type}">
                    <f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
                    <f:selectItems value="#{reagentMngController.typeList}" var="item"
                                   itemLabel="#{item.text}" itemValue="#{item.key}"></f:selectItems>
                </p:selectOneMenu>