Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'qa' of…

Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/service/thirdparty/PromotionActivityClient.java

@@ -68,7 +68,7 @@ public interface PromotionActivityClient {
     /**
      * 根据活动ID查询活动信息
      */
-    @GetMapping("/activities/share/getById")
+    @GetMapping("/activities/share/getActivity")
     ActivityGetByIdResponseDto getById(@RequestParam("activityId") Long activityId);
 
     /**