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

gdg

2021-02-01 8beaf701a900ddd5a0a482f425080635ff55166d

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

@@ -162,4 +162,9 @@
        hazardousWasteMapper.updateByPrimaryKeySelective(hazardousWaste);
    }

    @Override
    public List<HazardousWaste> setAllWasterCount(String starttime, String endtime, String status, String applyPerson) {
        return hazardousWasteMapper.setAllWasterCount(starttime, endtime, status, applyPerson);
    }

}