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

gdg

2021-01-29 31ffbaf322685984516cfb284fa58741debf4e96

 src/main/webapp/reagent_user_flow_info.xhtml

@@ -14,7 +14,7 @@
         <p:outputLabel styleClass="title" value="试剂流向追踪"></p:outputLabel>

         <p:panel styleClass="center-header">
            <p:panelGrid styleClass="filter" columns="11">
            <p:panelGrid styleClass="filter" columns="13">
               <p:outputLabel value="开始时间："></p:outputLabel>
               <p:calendar value="#{opeUseFlowInfoController.startDate}"></p:calendar>

@@ -27,6 +27,9 @@
               <p:outputLabel value="条形码："></p:outputLabel>
               <p:inputText value="#{opeUseFlowInfoController.reagentCode}"></p:inputText>

               <p:outputLabel value="柜号："></p:outputLabel>
               <p:inputText value="#{opeUseFlowInfoController.containerCode}"></p:inputText>

               <p:outputLabel value="场所名："></p:outputLabel>
               <p:inputText value="#{opeUseFlowInfoController.houseName}"></p:inputText>
               <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>