Merge branch 'master' into div

yujian

2019-07-11 876b7917a2ba518ae77ca47f1cd57c58d5e8e84c

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

@@ -16,9 +16,9 @@
import java.util.UUID;



import javax.annotation.Resource;

import javax.transaction.Transactional;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.web.multipart.MultipartFile;

import org.yeshi.utils.tencentcloud.COSManager;