From ecf9f0669734d4397aa1277f9a22f515aa410062 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:04:11 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
index f40245d..b957aac 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
@@ -309,12 +309,14 @@
@Override
- @Cacheable(value = "configCache", key = "'listQueryDefaultNavbar'")
- public List<HomeNavbar> listQueryDefaultNavbar() {
- return homeNavbarMapper.listQueryDefaultNavbar();
+ @Cacheable(value = "configCache", key = "'listQueryDefaultNavbar-'+#sex")
+ public List<HomeNavbar> listQueryDefaultNavbar(Integer sex) {
+ return homeNavbarMapper.listQueryDefaultNavbar(sex);
}
+
+
@Override
@Cacheable(value = "configCache", key = "'listQueryFixedNavbar'")
public List<HomeNavbar> listQueryFixedNavbar() {
--
Gitblit v1.8.0