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

gdg

2021-01-26 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47

 src/main/webapp/personal_use_info.xhtml

@@ -113,9 +113,9 @@
               <h:outputText value="#{row.articleNumber}"></h:outputText>
            </p:column>

            <p:column headerText="残存量">
               <h:outputText value="#{row.remainder}"></h:outputText>
            </p:column>
<!--            <p:column headerText="残存量">-->
<!--               <h:outputText value="#{row.remainder}"></h:outputText>-->
<!--            </p:column>-->

            <p:column headerText="申领人">
               <h:outputText value="#{row.userName}" />