Commit 745dfc00 by 周晓航

Merge branch 'KA-20210617评价有礼ID1031153-周晓航' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/dto/activity/WechatCouponInfoVo.java
parents 65533ad4 bb2eef4f
...@@ -19,4 +19,7 @@ public class WechatCouponInfoVo { ...@@ -19,4 +19,7 @@ public class WechatCouponInfoVo {
private List<SendCouponParamsVo> send_coupon_params; private List<SendCouponParamsVo> send_coupon_params;
private String sign;
} }
...@@ -36,7 +36,7 @@ public interface ActivityApplicationClient { ...@@ -36,7 +36,7 @@ public interface ActivityApplicationClient {
/** /**
* 查询可领券活动 * 查询可领券活动
* 目前: 评价有礼活动使用 * 目前: 评价有礼活动使用
*/ */
@PostMapping("/promotionActivity/evaluate/checkAndJoin") @PostMapping("/promotionActivity/evaluate/checkAndJoin")
public BaseResponse<CheckAndJoinResponse> checkAndJoin(@RequestBody ActivityRequestCommon requestVo); public BaseResponse<CheckAndJoinResponse> checkAndJoin(@RequestBody ActivityRequestCommon requestVo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment