冲突解决

admin

2019-03-13 bec6f7988cf5245afbb5a1f53ed5d607ffb864d0

冲突解决

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java

@@ -21,6 +21,7 @@
import com.yeshi.fanli.entity.bus.user.HongBao;

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

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

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

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



import net.sf.json.JSONObject;

@@ -31,6 +32,9 @@


    @Resource

    private UserRankingsService userRankingsService;

	
    @Resource

    private HongBaoV2CountService hongBaoV2CountService;





    /**