fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 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();



}