Merge branch 'rx-0822-咨询记录' into master-test

rx

2023-09-13 4a4eb1f83e7eb205390886aa7eaa2d4f51ff251b

 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);