Merge branch 'mater-1.6.0' into div

admin

2019-08-21 0f3fc66c7e2b234411e2f1b35671e7a547cdfd44

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

@@ -74,4 +74,8 @@
      return false;

   }



   @Override

   public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId) {

      return userSystemCouponRecordMapper.getNearByUserCouponId(userCouponId);

   }

}