conflict

Helius

2020-08-06 ad4774eff562d52b2677cfbcf8e55b8506d57891

 src/main/java/com/xcong/excoin/modules/home/service/MemberQuickBuySaleService.java

@@ -15,7 +15,11 @@
   

   public Result selectById(Long id);

   

   public Result selectAll(String type);

	
   public Result cancelRecharge(Long id);

   

   public Result sell(MemberEntity member,MemberQuickBuySaleDto memberQuickBuySaleDto);

	
   public Result cancelSell(Long id);

}