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

gdg

2021-02-02 aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b

 src/main/webapp/sys_dangerous_encode.xhtml

@@ -85,7 +85,6 @@
                         selection="#{dangerousEncodeController.selectOne}"
                         selectionMode="single"
                         pageLinks="5">

                <p:column headerText="试剂名称码">
                    <h:outputText value="#{row.reagentCode}"/>
                </p:column>
@@ -243,4 +242,4 @@
        </h:form>
    </p:dialog>
</ui:composition>
</html>
</html>