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

lyfO_o

2021-06-11 ea5cbe91b94e48e9f63947d01decdf919848ae91

 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;