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

admin

2020-06-22 07a64ebd6da54fb9481d9bf7e7afce62dce1ff21

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java

@@ -340,7 +340,7 @@


         UserSystemCoupon userSystemCoupon = null;

         try {

            userSystemCoupon = userSystemCouponService.freeCouponWin(giveUid, CouponTypeEnum.freeCoupon, 
            userSystemCoupon = userSystemCouponService.freeCouponWin(uid, CouponTypeEnum.freeCoupon, 
                  UserSystemCoupon.SOURCE_GIVE, 1, true);

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);