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

admin

2020-03-12 7a40d9ca41da29aee9464f545e10b452a1922c32

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

@@ -165,7 +165,7 @@
      RedPackDetail detail = new RedPackDetail();

      detail.setId(id);

      detail.setDisplay(true);

      detail.setDescInfo("领取人ID:" + giveRecord.getReceiveUid());

      detail.setRemark("领取人ID:" + giveRecord.getReceiveUid());

      detail.setType(RedPackDetailTypeEnum.giveOthersSucceed);

      detail.setTitle(RedPackDetailTypeEnum.giveOthersSucceed.getDesc());

      detail.setIdentifyCode(