Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-23 a39422f2a8ce45dd6cf65701ed5f9e65391c46c1

 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java

@@ -210,8 +210,8 @@
      

      // 红包退回

      if (taoLiJinOrigin.getOrigin().equals(TaoLiJinOriginEnum.refund)) {

         detail.setType(TaoLiJinDetailTypeEnum.reduce);

         detail.setTitle(TaoLiJinDetailTypeEnum.reduce.getDesc());

         detail.setType(TaoLiJinDetailTypeEnum.refund);

         detail.setTitle(TaoLiJinDetailTypeEnum.refund.getDesc());

      } else {

         detail.setType(TaoLiJinDetailTypeEnum.add);

         detail.setTitle(TaoLiJinDetailTypeEnum.add.getDesc());