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

gdg

2021-01-29 31ffbaf322685984516cfb284fa58741debf4e96

 src/main/webapp/warehouse_stock_mng.xhtml

@@ -79,7 +79,7 @@
         <br/>
         <h:form id="warehouseStockMngForm">
            <p:panel styleClass="center-header">
               <p:panelGrid styleClass="filter" columns="7">
               <p:panelGrid styleClass="filter" columns="9">

                  <p:outputLabel value="试剂名称："></p:outputLabel>
                  <p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
@@ -91,6 +91,9 @@
                                 var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
                  </p:selectOneMenu>

                  <p:outputLabel value="仓库名："></p:outputLabel>
                  <p:inputText value="#{warehouseStockMngController.warehouseName}"></p:inputText>

                  <p:outputLabel value="产品编号："></p:outputLabel>
                  <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>