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

admin

2020-06-11 d3a5dfe218fdee554decdd58a3c995e03bc1dec1

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushInfoServiceImpl.java

@@ -265,7 +265,7 @@
   

   

   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void executePush(PushInfo record) throws Exception, PushInfoException, PushException {



      if (PushInfo.STATE_SUCCESS == record.getState()) {