wanghui 8 years ago
parent
commit
59625a9541

+ 1 - 6
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -68,12 +68,7 @@ public interface AchievementService {
 	List<AchievementPortalSimilarListBo> findByFieldA(Integer fieldA, String id, Integer type);
 
 	int updateByPrimaryKeySelective(Achievement a);
-<<<<<<< HEAD
 	
 	/** 查询国际化技术 **/
-	List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementKey);
-=======
-
-
->>>>>>> branch 'master' of https://git.coding.net/aft/AFT.git
+	List<InternationalListBo> selectInternationalAchievement(Integer internationalAchievementKey);
 }

+ 2 - 5
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -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
+	}
 }