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

admin

2019-12-18 84ab5704aee0df06d0352ab67d1fa671ac284c8b

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java

@@ -141,6 +141,7 @@
               return Action.CommitMessage;

            }

         }

         //

      }

      return Action.CommitMessage;

   }