合并代码

puzhibing

2024-03-18 0b956579c125f41f27d1e09ecae5853926ef19fe

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java

@@ -55,7 +55,7 @@
     * @return  R<MerVerifyCouponGetVo>
     */
    @PostMapping("/getVerifyCoupon")
    public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody String verifyCoupon)
    public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody Long verifyCoupon)
    {
        MerVerifyCouponGetVo verifyCouponGetVo = memberCouponService.getVerifyCoupon(verifyCoupon);
        return R.ok(verifyCouponGetVo);
@@ -69,7 +69,7 @@
     * @return  R<MerVerifyCouponGetVo>
     */
    @PostMapping("/sureVerifyCoupon")
    public R<MerVerifyCouponGetVo> sureVerifyCoupon(@RequestBody String memberCouponId)
    public R<MerVerifyCouponGetVo> sureVerifyCoupon(@RequestBody Long memberCouponId)
    {
        MerVerifyCouponGetVo verifyCouponGetVo = memberCouponService.sureVerifyCoupon(memberCouponId);
        return R.ok(verifyCouponGetVo);