Merge branch 'master' into master-test

wangrenhuang

2023-11-06 155905061b3aa29d2aa23e5693e8704debfb9828

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

@@ -32,7 +32,7 @@
     * @return Result
     */
    @PostMapping(value = "/activity/shopId/list")
    Result getActivityList(@RequestParam("shoId") String shoId);
    Result getActivityList(@RequestParam("shoId") String shoId,@RequestParam("appId") String appId);


    /**
@@ -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);