Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211

mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java

@@ -75,6 +75,7 @@ public class WxCouponController extends BaseController {
         return couponList(wxCoupon, pageNum, pageSize, isList);
     }
     
+    @TenantIgnore
     @ApiOperation("父券分页列表接口")
     @GetMapping("parentCouponList")
     @ApiImplicitParams({
@@ -406,6 +407,16 @@ public class WxCouponController extends BaseController {
         logger.debug("[" + getIpAddr() + "] WxCouponController::findById");
         return new ResultData(wxCouponService.getVoById(id,getTenantInfo().getTenantId()));
     }
+    
+    @TenantIgnore
+    @ApiOperation("根据id查询接口")
+    @GetMapping("/findParentCouponById")
+    @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
+    @SystemControllerLog(description = "券投放-查询")
+    public ResultData findParentCouponById(@RequestParam Long id) {
+        logger.debug("[" + getIpAddr() + "] WxCouponController::findById");
+        return new ResultData(wxCouponService.getVoById(id,getTenantInfo().getParentTenantId()));
+    }
 
     @TenantIgnore
     @ApiOperation("卡营销列表接口")