Merge branch 'developer'

姜友瑶

2022-05-23 eaefb5f0d4fb5918786936dd60f4be7dd93011ba

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