From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 18 一月 2021 09:57:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/main/java/com/nanometer/smartlab/entity/enumtype/OperateStatus.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/nanometer/smartlab/entity/enumtype/OperateStatus.java b/src/main/java/com/nanometer/smartlab/entity/enumtype/OperateStatus.java index fa053b7..f2d9e46 100644 --- a/src/main/java/com/nanometer/smartlab/entity/enumtype/OperateStatus.java +++ b/src/main/java/com/nanometer/smartlab/entity/enumtype/OperateStatus.java @@ -3,7 +3,7 @@ import java.util.HashMap; public enum OperateStatus { - WAREHOUSEIN(10, "仓库入库"), WAREHOUSEOUT(11, "仓库领用"), LABORATORYIN(0, "试剂柜入库"); + WAREHOUSEIN(10, "仓库入库"), WAREHOUSEOUT(11, "仓库领用"), LABORATORYIN(0, "试剂柜入库"), TRANSFER(6,"转移"); private int key; private String text; @@ -27,7 +27,7 @@ map.put(d.key, d); } } - + public static OperateStatus parse(Integer index) { if(map.containsKey(index)){ return map.get(index); -- Gitblit v1.9.2