Merge remote-tracking branch 'origin/master'

admin

2019-04-15 debb3a579f798d71072f037f74e3e6b43b5fe0ee

 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;