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

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

 src/main/java/com/nanometer/smartlab/service/HazardousWasteServiceImpl.java

@@ -167,4 +167,9 @@
        return hazardousWasteMapper.setAllWasterCount(starttime, endtime, status, applyPerson);
    }

    @Override
    public HazardousWaste selectById(Long id) {
        return hazardousWasteMapper.selectByPrimaryKey(id);
    }

}