From ee2678ecb9e8d686252feed920a7b2284acd54da Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Mon, 18 Jan 2021 10:23:57 +0800
Subject: [PATCH] 冲突和修改
---
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
index be5eac7..ab07a2d 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java
@@ -283,7 +283,7 @@
@Override
public List<String> selectProjectsByContainerCode(String containerCode) {
String projects = sysLaboratoryContainerDao.selectProjectsByContainerCode(containerCode);
- if (projects != null){
+ if (projects != null){
return Arrays.asList(projects.split(","));
}
return null;
--
Gitblit v1.9.2