Merge branch 'fhx-prod-复购活动' into master-prod-new

fhx

2024-05-27 2d12c1e7182a0cf34d96536662bb3ca60afe4c0c

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCxjService.java

@@ -30,7 +30,7 @@
    /**
     * 等待情况
     */
    @PostMapping("/admin/cxj/report/appTimeLineChart/waitSituation")
    @PostMapping("/admin/cxj/report/waitSituation")
    Result waitSituation(@RequestBody CxjReportReqDto cxjReportReqDto);

    /**