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

gdg

2021-02-03 a3de8fe47c3eddc8cb086803db68c1bd0cd7c1b7

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