ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit e267ae775c82d777aa541d6b0dcb4816616a616a 1 parent 7182ab5d

二手

Inline Side-by-side
Showing 1 changed file with 0 additions and 11 deletions
1 package com.yoho.product.dal; 1 package com.yoho.product.dal;
2 2
3 -<<<<<<< HEAD  
4 import java.util.List; 3 import java.util.List;
5 4
6 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
@@ -16,15 +15,5 @@ public interface SecondhandInfoMapper { @@ -16,15 +15,5 @@ public interface SecondhandInfoMapper {
16 15
17 List<SecondhandInfo> selectByCondition(@Param("secondhandReq") SecondhandReq req); 16 List<SecondhandInfo> selectByCondition(@Param("secondhandReq") SecondhandReq req);
18 17
19 -=======  
20 -import com.yoho.product.model.SecondhandInfo;  
21 -import org.apache.ibatis.annotations.Param;  
22 -  
23 -import java.util.List;  
24 -  
25 -  
26 -public interface SecondhandInfoMapper {  
27 -  
28 List<SecondhandInfo> selectBySkups(@Param("skupList")List<Integer> skupList); 18 List<SecondhandInfo> selectBySkups(@Param("skupList")List<Integer> skupList);
29 ->>>>>>> 7d8bc67a093e2c7c112fa8f0b7e6b318eaa182ce  
30 } 19 }