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

gdg

2020-12-15 8932ae2a8dc22513c2b7925997dfb65983ea1d19

 src/main/webapp/laboratory_container_mng.xhtml

@@ -42,6 +42,8 @@
            </p:commandButton>
            <p:commandButton value="导入" styleClass="import-btn" onclick="importCon()"
            ></p:commandButton>
            <p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="${laboratoryContainerMngController.export2Excel}"
            />
            <script>
               function importCon(){
                  $("#laboratoryContainerMngForm\\:importReagentBtn_input").click();