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

gdg

2021-01-26 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47

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

@@ -31,4 +31,6 @@
    HazardousWaste selectByTid(String tid);

    void updateWaste(HazardousWaste hazardousWaste);

    List<HazardousWaste> setAllWasterCount(String starttime, String endtime, String status, String applyPerson);
}