From 61de83f769642ff7da3d7f32b39c5014167a2950 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 15 Jan 2021 17:34:48 +0800
Subject: [PATCH] 修改试剂库、库存查询,登录超时,导出订单领取
---
src/main/java/com/nanometer/smartlab/controller/UserMngController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
index d8b0f9a..9ef8dc1 100644
--- a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -7,6 +7,7 @@
import com.nanometer.smartlab.entity.enumtype.ApproverFlag;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import com.nanometer.smartlab.entity.enumtype.Waster;
import com.nanometer.smartlab.service.BaseMetaService;
import com.nanometer.smartlab.service.BaseRoleService;
import com.nanometer.smartlab.service.SysUserService;
@@ -66,6 +67,7 @@
private String editPasswor;
private List<BaseMeta> codeList;
private List<BaseRole> roleList;
+ private List<Waster> wasterSelectList;
public List<BaseRole> getRoleList() {
return roleList;
@@ -539,6 +541,14 @@
return seeFlagSelectList;
}
+ public List<Waster> getWasterSelectList() {
+ if (this.wasterSelectList == null) {
+ this.wasterSelectList = Arrays.asList(Waster.values());
+ }
+
+ return wasterSelectList;
+ }
+
public String getArp() {
return arp;
}
--
Gitblit v1.9.2