Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-25 e3940d7c6d251167fd1eac3e3877c5c32153b7b0

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponRecordDao.java

@@ -48,4 +48,5 @@

   List<CouponReceiveInfoVO> selectMyPastCoupon(@Param("companyId")Long shopId, @Param("userId") Long userId, @Param("pageVo") PaginationVO pageVo);

   int countUnuseCouponRecord(Long id);
}