Merge branch 'master-prod-new' into master-test

fwq

2023-11-14 9a9e8d995ea4c95e0303b456cf6fcd4188f97366

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

@@ -43,7 +43,8 @@
     * @return Result
     */
    @PostMapping(value = "/activity/check")
    Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal);
    Result check(@RequestParam("userId") String userId,@RequestParam("id") String id,
                 @RequestParam("ordersTotal") BigDecimal ordersTotal,@RequestParam("shopId") String shopId);