From e1454a154718e20abbab36d0def4de9124a07254 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 12:03:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/controller/OrderMngController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java b/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
index 730bec7..c1f72a4 100644
--- a/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/OrderMngController.java
@@ -63,7 +63,7 @@
private Map<String, List<SysWarehouseContainer>> warehouseIdContainerMap;
public void initRukuPage() {
- this.userSelectList = this.sysUserService.getSysUserList(null, null, null, null, null);
+ this.userSelectList = this.sysUserService.getSysUserList(null, null, null, null, null,null,null);
//将admin置于首位
for (int i = 0; i < userSelectList.size(); i++) {
if ("admin".equals(userSelectList.get(i).getAccount())){
--
Gitblit v1.9.2