Merge remote-tracking branch 'origin/master'

wangrenhuang

2022-08-09 1e54931e0a5f12f5c1125b30abfef378c050bd4d

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