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

admin

2020-05-16 554d3857358b0ea53c4f65d8d9baad113ef1deb4

 fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java

@@ -246,7 +246,7 @@
      detail.setSubTitle("订单售后");

      detail.setType(UserMoneyDetailTypeEnum.shareWeiQuan);

      detail.setSourceIdentifyId(drawBack.getId());

      detail.setDescInfo("订单号：" + UserUtil.filterOrderId(drawBack.getOrderId()));

      detail.setDescInfo("订单号：" + drawBack.getOrderId());

      detail.setUpdateTime(new Date());

      detail.setUserInfo(new UserInfo(uid));

      detail.setOrderType(Constant.SOURCE_TYPE_TAOBAO);