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

admin

2020-06-22 b3f5e5ba3fd436f00f73cef1de6e8208fe6cf8c4

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

@@ -2,7 +2,7 @@


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

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

import com.yeshi.fanli.exception.PushException;

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



public interface BasePushService {

   /**