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

lyfO_o

2021-06-21 4d3856e802d5c9d28d8654f35da426bdb517d7d4

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