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

yujian

2019-10-16 a3e1aec60d2f886b8c48966c889b567719d0c5ea

 fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java

@@ -18,7 +18,7 @@
import com.yeshi.fanli.dto.push.PushContentDTO;

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

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.exception.PushException;

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

import com.yeshi.fanli.log.LogHelper;

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

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