Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-10 99edd3ce8ee02b358245bff195a9f63677ef61d6

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserRankingsAdminController.java

@@ -33,7 +33,7 @@
import com.google.gson.reflect.TypeToken;

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

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

import com.yeshi.fanli.exception.UserRankingsException;

import com.yeshi.fanli.exception.user.UserRankingsException;

import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.UserRankingsService;

import com.yeshi.fanli.tag.PageEntity;