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

lyfO_o

2021-12-13 7d4f221ad350447684beb2bced054d659c5592a1

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

 src/main/webapp/view_order_mng.xhtml

@@ -33,7 +33,7 @@
                paginator="true" paginatorAlwaysVisible="false"
                paginatorPosition="bottom" lazy="true"
                value="#{supplierOrderMngController.opeApplyList}"
                var="row" rowKey="#{row.reagent.id}" emptyMessage="无数据" rows="20"
                var="row" rowKey="#{row.id}" emptyMessage="无数据" rows="20"
                         selection="#{supplierOrderMngController.selectedViewList}"
                pageLinks="5">
                <p:column selectionMode="multiple" style="width: 30px;text-align: center;"/>