From 529173267b4e7b4b296e92a8c8705e0da5180c89 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 18:08:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java b/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
index a6cea3a..df1eaf8 100644
--- a/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
+++ b/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;
--
Gitblit v1.9.2