fix conflect

Helius

2020-07-31 829d77f7145514d67d957ad54dbef854440f77d3

 src/main/java/com/xcong/excoin/modules/home/dao/MemberQuickBuySaleDao.java

@@ -9,4 +9,6 @@
   

   MemberQuickBuySaleEntity selectByIdAndMemberId(@Param("memberId")Long memberId,@Param("id")Long id);



   int updateQuickBuySaleTimeOut();



}