From 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 23 Feb 2021 16:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index f00e5f5..5534258 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -471,10 +471,8 @@
}
public List<SysController> getControllers() {
- if(controllers == null)
- {
this.controllers = sysControllerService.getAllControllerList();
- }
+
return controllers;
}
--
Gitblit v1.9.2