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

gdg

2021-02-03 a3de8fe47c3eddc8cb086803db68c1bd0cd7c1b7

 src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.java

@@ -33,4 +33,6 @@
    List<HazardousWaste> setAllWasters(@Param("starttime") String starttime,@Param("endtime") String endtime,@Param("status") String status,@Param("applyPerson") String applyPerson);

    HazardousWaste selectByTid(@Param("tid") String tid);

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