Merge branch 'master' into div1

yujian

2018-12-29 2dff570ccfa532f8c012bc13829b302dd3e1b9d3

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

@@ -408,6 +408,7 @@
      detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.extractReject.name() + ":" + extract.getId()));

      detail.setMoney(extract.getMoney());

      detail.setSourceIdentifyId(extract.getId());

      detail.setSubTitle("原路退回");

      detail.setTitle(UserMoneyDetailTypeEnum.extractReject.getDesc());

      detail.setType(UserMoneyDetailTypeEnum.extractReject);

      detail.setUpdateTime(new Date());