冲突后的正式环境代码更改

admin

2019-04-12 4fc1db714a767ab3bf2106028cbd59f3580e7180

 fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java

@@ -8,15 +8,13 @@
import com.yeshi.fanli.entity.xinge.MessageInfo;

import com.yeshi.fanli.entity.xinge.PushRecord;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.push.PushService;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONObject;



public class PushUtils {



   private static SystemService systemService;

	
   @Resource

   private PushService pushService;