From e1cce0b77f02cf43024a6142bf49d75566ac2181 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 31 三月 2021 15:28:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
index ed60a29..5534258 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LaboratoryContainerMngController.java
@@ -471,7 +471,7 @@
}
public List<SysController> getControllers() {
- this.controllers = sysControllerService.getAllControllerList();
+ this.controllers = sysControllerService.getAllControllerList();
return controllers;
}
--
Gitblit v1.9.2