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

jyy

2021-07-10 1ee0a09016bd72b508456b23dae1afab44cd856b

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