From 2764ae2d7f4d9cb9810a2188c92cb2eb439c3f22 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 09 五月 2019 13:07:02 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/BusinessSystemServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/BusinessSystemServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/BusinessSystemServiceImpl.java
index 3902dc0..b1857b1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/BusinessSystemServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/BusinessSystemServiceImpl.java
@@ -32,7 +32,6 @@
}
@Override
- @Cacheable(value = "sysCache", key = "'getBusinessSystem-'+#platform+'-'+#packages")
public BusinessSystem getBusinessSystem(String platform, String packages) {
if (platform == null || packages == null) {
return null;
@@ -47,6 +46,7 @@
return list.get(0);
}
+ @Cacheable(value = "sysCache", key = "'getBusinessSystem-'+#platform+'-'+#packages")
@Override
public BusinessSystem getBusinessSystemCache(String platform, String packages) {
return getBusinessSystem(platform, packages);
--
Gitblit v1.8.0