|
|
@@ -603,7 +603,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
return achievementMapper.updateByPrimaryKey(a);
|
|
|
}
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
+
|
|
|
@Override
|
|
|
@Cacheable(value = "internationalAchievementList", key = "'internationalAchievementList:'+#internationalAchievementCacheKey")
|
|
|
public List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementCacheKey) {
|
|
|
@@ -613,8 +613,5 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
|
|
|
@CacheEvict(value = "internationalAchievementList", allEntries = true)
|
|
|
public void cleanInternationalAchievement() {
|
|
|
LoggerUtils.debug(logger, "清除国际化技术列表");
|
|
|
- }
|
|
|
-
|
|
|
-=======
|
|
|
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
|
|
|
+ }
|
|
|
}
|