Merge remote-tracking branch 'origin/master'

admin

2019-03-25 f8cda1190cbe07208dddc9365a06b0871e83e126

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java

@@ -23,7 +23,7 @@
import org.yeshi.utils.tencentcloud.COSManager;



import com.yeshi.fanli.dao.mybatis.UserRankingsMapper;

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

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

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

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

import com.yeshi.fanli.exception.UserRankingsException;