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

lyfO_o

2021-06-11 e1454a154718e20abbab36d0def4de9124a07254

 src/main/webapp/warehouse_reagent_use_person.xhtml

@@ -45,6 +45,7 @@
               <p:outputLabel value="实验室试剂柜："></p:outputLabel>
               <p:selectOneMenu value="#{warehouseStockMngController.laboratoryContainerId}" id="stacks"
                  >
                  <f:ajax listener="#{warehouseStockMngController.setContainerId}"/>
                  <f:selectItems value="#{warehouseStockMngController.laboratoryContainers}"
                     var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
               </p:selectOneMenu>