conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

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



}