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

gdg

2021-02-23 8b6a2a67a0bf081252648ba46fffd5591b3afc98

 src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java

@@ -206,7 +206,7 @@
    public List<String> getStatusList() {
        statusList = new ArrayList<> ();
        statusList.add("全部");
        statusList.add("待解决");
        statusList.add("待确认");
        statusList.add("已解决");
        statusList.add("已拒绝");
        return statusList;