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

admin

2020-05-12 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d

 fanli/src/main/java/com/yeshi/fanli/entity/config/push/PushMsgFactory.java

@@ -38,7 +38,7 @@
      String title = Constant.znxConfig.getShareOrderStatisticedTitle();

      String content = Constant.znxConfig.getShareOrderStatisticedMsg();

      content = content.replace("[订单类型]", Constant.getSourceName(sourceType))

            .replace("[订单号]", UserUtil.filterOrderId(orderId)).replace("[金额]", money.toString());

            .replace("[订单号]", orderId).replace("[金额]", money.toString());

      return new PushContentDTO(title, content);

   }