Merge branch 'master-base' into master-fwq-爆款活动2.0

fwq

2024-07-17 cb7bf61ddec695b25f8fe509815c5e5794180b0f

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java

@@ -42,8 +42,9 @@
     * @param ordersTotal 订单总金额
     * @return Result
     */
    @PostMapping(value = "/activity/list")
    Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal);
    @PostMapping(value = "/activity/check")
    Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,
                 @RequestParam("ordersTotal") BigDecimal ordersTotal,@RequestParam("shopId") String shopId);