Merge remote-tracking branch 'origin/master'

admin

2019-05-15 3be3f6e670d2e11d7ced76b8202f0ef30b56870f

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

@@ -5,7 +5,7 @@


import org.springframework.web.multipart.MultipartFile;



import com.yeshi.fanli.entity.admin.InviteGetMoney;

import com.yeshi.fanli.dto.money.InviteGetMoney;

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

import com.yeshi.fanli.exception.UserRankingsException;