Merge remote-tracking branch 'origin/master'

lisy

2023-07-26 3c30fbe42c95bfc5a48768b26c3a3f8e38a7cfdc

 cloud-server-activity/src/main/java/com/dsh/activity/mapper/UserCouponMapper.java

@@ -29,6 +29,5 @@
    List<Map<String, Object>> queryAvailableCouponList(@Param("uid") Integer uid, @Param("storeId") Integer storeId,
                                       @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode);

    List<UserCoupon> queryCanuseConponIds(@Param("userId")Integer userId,@Param("couponIds")List<Integer> couponIds);

}