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

yujian

2019-12-25 59aced4fe04f7e2fdcca81cb9ef279a70522301e

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

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

import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;

import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;

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

import com.yeshi.fanli.util.StringUtil;