冲突产生的文件

yujian

2019-06-25 e048db91382fa13e0b53e170390eea5fb5931221

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/LostOrderMapper.java

@@ -16,7 +16,7 @@
    * @param orderId
    * @return
    */
   List<LostOrder> selectByOrderId(String orderId);
   List<LostOrder> selectByOrderIdAndType(@Param("orderId")String orderId,@Param("type") int type);

   /**
    * 统计用户申诉次数