Merge remote-tracking branch 'origin/master'

ANDRU-PC\Andru

2022-08-10 c800715e798d45e50aa6b8e6930a7a680526177d

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

@@ -31,7 +31,7 @@
     * @param shoId 门店标识
     * @return Result
     */
    @PostMapping(value = "/activity/list")
    @PostMapping(value = "/activity/shopId/list")
    Result getActivityList(@RequestParam("shoId") String shoId);


@@ -43,7 +43,7 @@
     * @return Result
     */
    @PostMapping(value = "/activity/list")
    Result getActivityList(@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);