冲突

yujian

2019-08-30 ffbd3afe3806bfdbb13487f6031b938cb1ebcf9b

 fanli/src/main/java/com/yeshi/fanli/service/inter/config/JumpDetailService.java

@@ -2,8 +2,6 @@


import java.util.List;



import org.springframework.cache.annotation.Cacheable;



import com.yeshi.fanli.entity.common.JumpDetail;

import com.yeshi.fanli.exception.NotExistObjectException;



@@ -25,7 +23,5 @@


   public JumpDetail getlastJumpDetail();



	
   public JumpDetail getlastJumpDetailCache();



}