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

gdg

2021-02-25 db523e0fdf7801cdc01f10886f2c9aec04e711bb

 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);
}