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

admin

2020-03-17 8f4a68065574a7ef1f9e8b53902d1f081ec69aab

 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(