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

yujian

2020-05-14 6cb04a3c75f46001a55be402c6650d5600748dc7

 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()) {