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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

 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);