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

gdg

2021-01-18 3ec412f3cdc8b114cf629e866a7b7b80687a3442

 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}" />