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

lyfO_o

2021-06-11 ea5cbe91b94e48e9f63947d01decdf919848ae91

 src/main/webapp/order_mng_ruku.xhtml

@@ -118,7 +118,7 @@
                            <h:outputText value="#{row.articleNumber}" />
                        </f:facet>
                        <f:facet name="input">
                            <p:inputText value="#{row.articleNumber}" maxlength="32" style="width: 100%"/>
                            <p:inputText value="#{row.articleNumber}" maxlength="32" style="width: 100%" required="true" requiredMessage="请输入批号"/>
                        </f:facet>
                    </p:cellEditor>
                </p:column>