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

gdg

2021-02-02 529173267b4e7b4b296e92a8c8705e0da5180c89

 src/main/java/com/nanometer/smartlab/api/ApiAction.java

@@ -577,7 +577,7 @@
        logger.info("getUserInfo start...");

        List<SysUser> userList = sysUserService.getSysUserInfoList(startTime, endTime);
        List<SysLaboratoryContainer> allLaboratoryContainerList = sysLaboratoryContainerService.getSysLaboratoryContainerList(null,null,null,null,null);
        List<SysLaboratoryContainer> allLaboratoryContainerList = sysLaboratoryContainerService.getSysLaboratoryContainerList(null,null,null,null,null,null,null);
        List<SysWarehouseContainer> allWarehouseContainerList = sysWarehouseContainerService.getSysWarehouseContainerList(null,null,null,null,null);

        List<String> containerCodeList = new ArrayList<String>();