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

gdg

2020-12-10 b805858ea0341e13f6213c3a9b01da6a13d22f83

 src/main/webapp/apply_mng_new.xhtml

@@ -307,7 +307,7 @@
                                 resizableColumns="true" paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
                                 lazy="true" value="#{applyMngController.reagentDataModel}" var="row" rowKey="#{row.id}"
                                 emptyMessage="无数据" selectionMode="single"
                                 rows="50" pageLinks="5">
                                 rows="15" pageLinks="5">

                        <p:ajax event="rowDblselect" listener="#{applyMngController.onReagentRowSelect}" update=":applyMngNewForm,:applyDialog"></p:ajax>
                        <p:column headerText="产品编号">