Merge remote-tracking branch 'origin/div' into div

admin

2019-08-21 9541560d6923103454c4e6499c8c82f031205169

 fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java

@@ -1,7 +1,5 @@
package com.yeshi.fanli.service.inter.push;



import java.util.List;



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

import com.yeshi.fanli.entity.system.SystemZnx;

import com.yeshi.fanli.exception.PushException;