Merge branch 'developer'

Helius

2022-03-14 7940cb1960203e4407968e6f6d8b720dafcc5397

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