Merge branch 'master' into dev-moneydetail

admin

2018-12-19 d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShamUserService.java

@@ -3,7 +3,6 @@
import java.math.BigDecimal;

import java.util.List;



import com.yeshi.fanli.entity.bus.user.HongBaoMessage;

import com.yeshi.fanli.entity.bus.user.ShamUser;



/**

@@ -18,11 +17,9 @@


   public List<ShamUser> getAll();



   public List<HongBaoMessage> getManyData();



   public void delete(long id);



   public List<HongBaoMessage> findShamThreeSaleInfo();



   public List<ShamUser> findShamUserList(int sum);