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

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralTaskRecordServiceImpl.java

@@ -518,6 +518,7 @@
    * @param tlj

    */

   @Override

   @Transactional(rollbackFor = Exception.class)

   public void taoLiJinExchange(Long uid, Integer addGoldCoin, BigDecimal tlj) {

      String uniqueKey = "taoLiJinExchange-" + uid.toString();

      IntegralDetail detailRecord = integralDetailService.getDetailByUniqueKey(uniqueKey);