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

admin

2019-12-28 1c8b5d11b68e727ef5ccc130327e2400f937321b

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

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

            }

         }

         //

      }

      return Action.CommitMessage;

   }