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

gdg

2021-02-02 529173267b4e7b4b296e92a8c8705e0da5180c89

 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>