Merge remote-tracking branch 'origin/master'

fwq

2022-08-12 6af64892d593303fed386e468347c2ff41ab99b6

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


    /**