Merge remote-tracking branch 'origin/master' into div

yujian

2019-06-24 cb6f69f1207ab6cc9c6006515cb831833cfe0d36

 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;