Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-14 e6d19def344a8875a2ec850068df41647649b20a

 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);
}